diff options
| author | Hall Liu <hallliu@google.com> | 2016-06-20 21:44:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 21:44:09 +0000 |
| commit | 3e633acd70a4dc0bdd0de3d2dfd4d1adeffc364f (patch) | |
| tree | 6bf5e644ac29b605c4c1b58ca757875e76679e63 /tools/aapt2/diff/Diff.cpp | |
| parent | 22ac3a0c21c8e5293b780b7a0ceb2fb8844b7f20 (diff) | |
| parent | 7e62bf065c6cc732c53b20573d0b061c8453fda6 (diff) | |
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: 7e62bf065c
Change-Id: I037d97fdcc2270b8bccb68422d102f1cd5c3ef2e
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions