diff options
author | Wale Ogunwale <ogunwale@google.com> | 2016-06-20 23:07:55 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 23:07:55 +0000 |
commit | 6d296286e4bb1594a2dcfe955883dace504a2f33 (patch) | |
tree | 1fd0fe3949d55a2aa1e6ebd60a5ae33c47f43aae /tools/aapt2/diff/Diff.cpp | |
parent | 24ac2ece504bae11ba762c63891cd5518a850f31 (diff) | |
parent | f159b74608f76433a4e4ee563e13f7fa38ea559c (diff) |
Merge \"Don\'t re-launch stopped activities while the device is sleeping\" into nyc-dev
am: f159b74608
Change-Id: I83edfb392f0f179b4c28aaab3eba0c51fe11d207
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions