diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2016-06-20 21:20:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 21:20:29 +0000 |
| commit | 96eea7136a795b225eda6b7542acf0f958e55b56 (patch) | |
| tree | 88fee31f9aceb9a71919d34b41bf91ff9d657b39 /tools/aapt2/diff/Diff.cpp | |
| parent | 901c03faba8c73194e694222477ce8d2c594d324 (diff) | |
| parent | beaf3707fa5e853384ef2165b21e05154d51632e (diff) | |
Merge \"Revert \"Don\'t re-launch activities while the device is sleeping\"\" into nyc-dev
am: beaf3707fa
Change-Id: I50f6a45a56650569047c046d275f39b0929c38e4
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions