diff options
| author | Jack Yu <jackyu@google.com> | 2017-03-24 17:22:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-24 17:22:45 +0000 |
| commit | 3c9d3bc99b043cabbcab67c62159195da7e164e6 (patch) | |
| tree | 22655fc4fdd2c41e1811268e53af88d57e764481 /tools/aapt2/diff/Diff.cpp | |
| parent | f3f5e9f7bb4ce341c7327b7f38784f7b1d8d217c (diff) | |
| parent | 7da96487ab39938723c21443855f0e5a5a114c3c (diff) | |
Merge "Deprecated getDeviceId and added getMeid and getImei" am: ad2e7405ad am: 9b7d3a86bd
am: 7da96487ab -s ours
Change-Id: I14c2cfa9d1b4ba7986393b7aab00abe94d24fce5
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions