diff options
| author | Jonathan Basseri <misterikkit@google.com> | 2016-05-26 23:33:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 23:33:32 +0000 |
| commit | 0660813aa916917f33ffe4ed3b72849cdc43a986 (patch) | |
| tree | 2e449245ea67fa821cf19155dce90fd9ba839a29 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 82bccd7f8537f301f8dc100403c6c435ee3a21ab (diff) | |
| parent | f322db1e0db11c670c34bea6014c3d43f030941b (diff) | |
Merge "Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am: 4c04097fdb am: 531cd8724c" into nyc-mr1-dev-plus-aosp
am: f322db1e0d
* commit 'f322db1e0db11c670c34bea6014c3d43f030941b':
Change-Id: Ie16b5e1b2c2012282cb3777ca4ea8fa2954264e1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions