diff options
| author | Xiangyu/Malcolm Chen <refuhoo@google.com> | 2019-03-12 21:14:24 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-12 21:14:24 -0700 |
| commit | 2a661fa7ad121cd23940244e130f2b9d2ccd3067 (patch) | |
| tree | 90a1f65b00ce3927bbbd7269bb6b0cf87525b90a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a6d819a4556a631a7dbc4cae60e47fb27def8cf8 (diff) | |
| parent | 1eb9df20880e5543f86d3bb354d0ef43c48230b0 (diff) | |
[automerger skipped] Merge "Don't return hidden subscription in getActiveSubscriptionInfoList." am: 8cbe957dba am: 6dc894e962
am: 1eb9df2088 -s ours
am skip reason: change_id I3a9f3a9a2628a8e2ad1c401f6fe5e4c5866a0047 with SHA1 5b16f8d92b is in history
Change-Id: I4fa2131138161b96779962ef413c42b1237c29db
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions