diff options
| author | Marie Janssen <jamuraa@google.com> | 2017-01-30 17:57:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-30 17:57:02 +0000 |
| commit | ca312c1cd35dd92a2ac8d008115524605d21605e (patch) | |
| tree | ef109ff74e8291f193800136fd0d6d9651ef2907 /tools/aapt2/diff/Diff.cpp | |
| parent | 1852c380e0cb5497f1eb0587e97d4e6048961dd8 (diff) | |
| parent | 7f8d8638ebf0f052e9a8c214206c51ed3e504b97 (diff) | |
Merge "Bluetooth: add getDiscoveryEndMillis() call" am: 1785fc4eea
am: 7f8d8638eb
Change-Id: I6f02c4ddc0fe56cda5af2dcf2f5193ba13522792
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions