diff options
author | Wale Ogunwale <ogunwale@google.com> | 2016-06-20 23:08:12 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 23:08:12 +0000 |
commit | 87ca3c1fa547c20b161872f400f077a69ca0eeec (patch) | |
tree | 16b10720aae1a809890ee85fdc93643e901a0f3f /tools/aapt2/diff/Diff.cpp | |
parent | 2beba073d1666ff335f4fa14fbf4c5fd9db010a2 (diff) | |
parent | f159b74608f76433a4e4ee563e13f7fa38ea559c (diff) |
Merge \"Don\'t re-launch stopped activities while the device is sleeping\" into nyc-dev
am: f159b74608
Change-Id: Iaf6cdfd3e6b7ec6a1e1d37cc200b196d105f1ef7
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions