diff options
| author | Hall Liu <hallliu@google.com> | 2016-06-20 21:49:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 21:49:31 +0000 |
| commit | 5010516c477599c541faa071bc1a5e736d03fad8 (patch) | |
| tree | 3f678ca0bc4e0cbd870b4f083aae18492c516c91 /tools/aapt2/diff/Diff.cpp | |
| parent | b70ef1ae859e66bb591057d9ca5dc8bc623b6531 (diff) | |
| parent | ab1383d16103b653213a7955732892b679d4e09f (diff) | |
Merge \"Merge \\\\\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\\\\\" into mnc-dev am: fc32ec1aef am: aeba34533c am: 317d0cb169 am: edace5e820 -s ours am: f184789ae9 am: 4eff005260\" into nyc-mr1-dev-plus-aosp
am: ab1383d161 -s ours
Change-Id: Ie9cae84613360c545b9b578903e965eb1adbb8c5
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions