diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2016-06-20 21:31:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 21:31:39 +0000 |
| commit | 3ed7d209c33fffb78a01748da69e86ad9bc170e8 (patch) | |
| tree | 3f678ca0bc4e0cbd870b4f083aae18492c516c91 /tools/aapt2/diff/Diff.cpp | |
| parent | 4af72f335a30c80a3597e2de587e86d488589476 (diff) | |
| parent | 22ac3a0c21c8e5293b780b7a0ceb2fb8844b7f20 (diff) | |
Merge \"Merge \\\"Revert \\\"Don\\\'t re-launch activities while the device is sleeping\\\"\\\" into nyc-dev am: beaf3707fa am: 96eea7136a\" into nyc-mr1-dev-plus-aosp
am: 22ac3a0c21
Change-Id: I79a43c09639b648175e7b3ec93a3d35722fe67e6
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions