diff options
| author | Ajay Panicker <apanicke@google.com> | 2016-09-21 00:12:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-21 00:12:20 +0000 |
| commit | 959b1aa5b9297bcb006e809cd34d61ae7d423017 (patch) | |
| tree | fc8ba572551442958b2765e06f5f463380f926fa /tools/aapt2/diff/Diff.cpp | |
| parent | fafa73a8acee5d8c25fc3362276b8e740c374db3 (diff) | |
| parent | 4f77ca16e4ea9c319d713d1e765247983885a4f7 (diff) | |
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours
am: 4f77ca16e4 -s ours
Change-Id: I6be29367b410ffc98e61d49450bb1d9905fbf3f8
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions