diff options
| author | Ajay Panicker <apanicke@google.com> | 2017-03-06 18:35:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-06 18:35:08 +0000 |
| commit | 8aa30c04b89292328177c02ffd37469de699f1ad (patch) | |
| tree | 885b628dae0712cbd6ff23ef40290d69ee78e001 /tools/aapt2/diff/Diff.cpp | |
| parent | 8ff1e7ab739772dc94f21018a5cc09659a1d73b8 (diff) | |
| parent | a38d289d8ae6bc6a2b526a03dbe82f8a9d655bfc (diff) | |
Merge "Bluetooth: Use content observer for airplane mode" am: 8871623b8d -s ours am: 4ddee9722d
am: a38d289d8a
Change-Id: I8f4d104bef04919b0ca74394a94d2d75b65ced6e
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions