diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2016-06-16 21:36:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-16 21:36:25 +0000 |
| commit | 55ce4a5f19970da83c8f66daae81e51ee42ee0c0 (patch) | |
| tree | b7b693b7e3219d7636beb300d923bb86adcc6379 /tools/aapt2/diff/Diff.cpp | |
| parent | ddfeb4a6c2bc97250619175a281746344e7c40d2 (diff) | |
| parent | f6e3c9a5537a5e1e7ef7be956d8a335106afd8f7 (diff) | |
Merge \"Don\'t re-launch activities while the device is sleeping\" into nyc-dev
am: f6e3c9a553
Change-Id: I72d39e81ae786f18fb3991fb243837e802440311
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions