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