diff options
| author | Hall Liu <hallliu@google.com> | 2016-06-20 21:15:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 21:15:42 +0000 |
| commit | aeba34533ce9aa8ad20c6f872c4fcc185275c004 (patch) | |
| tree | 5327fbe68cc60d5a321567e096f4f87885cda60c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 34fb87b5191efa9e4865b43567a733fc51369747 (diff) | |
| parent | fc32ec1aef6b11e9145252a25c3a5b2cb7f82696 (diff) | |
Merge \"DO NOT MERGE Disable app pinning when emergency call button pressed\" into mnc-dev
am: fc32ec1aef
Change-Id: I04ff0004a9112cfbe7e61b2fa6cb3fd4f037bbd0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions