diff options
| author | Nazanin Bakhshi <nazaninb@google.com> | 2019-03-09 07:26:24 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-09 07:26:24 -0800 |
| commit | a512adf4f8c91fb3503ed7ac23ce83739235548c (patch) | |
| tree | bb4182aee7d4f6ee6915a7deffce483e44fd9646 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 08c3b4429f1619d592e92967d50ce718413ad021 (diff) | |
| parent | d7735a130aaaed50e32365570df53c2b76c72392 (diff) | |
[automerger skipped] Merge "make onActiveDataSubId in PhoneStateListener public API" am: dfe984c3fe am: 558a5e2632
am: d7735a130a -s ours
am skip reason: change_id I6e5a5c8273348d822b8f552599784b8e986850bf with SHA1 026c42d752 is in history
Change-Id: I7050435f330e9da4b41b83db2ef0c2dd5257ed86
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions