diff options
| author | Hall Liu <hallliu@google.com> | 2016-06-20 21:21:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 21:21:25 +0000 |
| commit | 317d0cb1695d63db19d1ed9f4e5cd1b39cbb26d3 (patch) | |
| tree | d83c5fcc7cd368c9a42b2301ed8d2f2945fc25e8 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 1a450675f35760dbeb5ab18fc07fbc04a730ce9f (diff) | |
| parent | aeba34533ce9aa8ad20c6f872c4fcc185275c004 (diff) | |
Merge \\"DO NOT MERGE Disable app pinning when emergency call button pressed\\" into mnc-dev am: fc32ec1aef
am: aeba34533c
Change-Id: Id2da5c1dcf1477c5ee71e1ecb25ccfbc92aed7bc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions