diff options
| author | Jonathan Basseri <misterikkit@google.com> | 2016-05-26 23:17:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 23:17:25 +0000 |
| commit | 448b67ee15bbfd9a3427b154f65a0b76bd7a1c69 (patch) | |
| tree | 5cad9374a8ac94d0d99c7f43e1acd25d9007c9e4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e221f808e54fe45a4b44099f0a2b5a998d604672 (diff) | |
| parent | 9a19e8948d7a716bf9ad6743ad85cbc4e2a5942d (diff) | |
resolve merge conflicts of 4c04097 to nyc-mr1-dev am: 04c35e78db
am: 9a19e8948d
* commit '9a19e8948d7a716bf9ad6743ad85cbc4e2a5942d':
Change how TelephonyManager handles subscriptions.
Change-Id: I7f2c6b4b7b4c1a2229c43003f0cfa6734fdc227a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions