diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-06-20 21:28:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-20 21:28:58 +0000 |
| commit | 22ac3a0c21c8e5293b780b7a0ceb2fb8844b7f20 (patch) | |
| tree | 6bf5e644ac29b605c4c1b58ca757875e76679e63 /tools/aapt2/diff/Diff.cpp | |
| parent | 4553be6e301e328fc53513858b97c90f318b17c6 (diff) | |
| parent | 40f3540e0bbbded8e0173b0e5b9dedd9915f250f (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
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions