summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2014-09-23 16:03:44 -0700
committerEtan Cohen <etancohen@google.com>2014-09-27 04:55:28 +0000
commitdcc0736c4341335dc73856d98ac940c2ad7eba8f (patch)
tree542d657553f4c9e8f2fd497e1b653d32ce6c0e40 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6e2bba7d34adab1e4327cd15a3d506e61fffa777 (diff)
Added mechanism to merge voice & baseline ServiceState objects.
Needed in the context of separate phones handling baseline connectivity and voice connectivity (e.g. IMS). Bug: 17627405 Change-Id: Ifb5a6ea11f6350090b989408e9eed80958d8558b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions