diff options
author | Jonathan Basseri <misterikkit@google.com> | 2016-05-26 23:24:45 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 23:24:45 +0000 |
commit | d099eddf8da93d05a914aed87e64daa0d966e8d3 (patch) | |
tree | 7c9399e00428d8ebfb99317df80bb274c42a892d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9a19e8948d7a716bf9ad6743ad85cbc4e2a5942d (diff) | |
parent | 531cd8724cad56e2a141dbe5acbe283372c21de4 (diff) |
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am: 4c04097fdb
am: 531cd8724c
* commit '531cd8724cad56e2a141dbe5acbe283372c21de4':
Change-Id: I60f30d1169e65fde080d398a06d2b543a0278238
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions