diff options
| author | Marie Janssen <jamuraa@google.com> | 2017-01-30 19:11:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-30 19:11:46 +0000 |
| commit | 2db3f99cfe94d8192f8835947c5fb3b6e74abd47 (patch) | |
| tree | 4b23fc189d2bec23758afcaba2a6d1a37ae299e1 /tools/aapt2/diff/Diff.cpp | |
| parent | 6675bbf093e2d9fdb620ed42602dde2a7902e8ce (diff) | |
| parent | 9eb3d7e3350874bfff54830877c3c5427b70cfb7 (diff) | |
Merge "Bluetooth: add getDiscoveryEndMillis() call" am: 1785fc4eea am: 7f8d8638eb am: ca312c1cd3
am: 9eb3d7e335
Change-Id: I45a29862c9a841b68bee41daff1d8e46145cbd79
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions