diff options
| author | Hall Liu <hallliu@google.com> | 2016-05-31 17:47:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 17:47:52 +0000 |
| commit | 5d06b41ef6c35af5fe48f1d70c5e201faf89f6e8 (patch) | |
| tree | 2b7efe47d069f52c043231038783ab6dcf732e80 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | b2731df639dadb726d6d13569d4844300d750b75 (diff) | |
| parent | 1bc922b544549d2d5b3e45603b0c28da8d140b72 (diff) | |
Merge "Merge "Disable app pinning when emergency call button pressed" into nyc-dev am: 8b655e0f57 am: fe9877d877" into nyc-mr1-dev-plus-aosp
am: 1bc922b544
* commit '1bc922b544549d2d5b3e45603b0c28da8d140b72':
Change-Id: Ie90cc4e830297a1410ac51822b3252f293b15661
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions