diff options
author | Julius D'souza <jdsouza@google.com> | 2016-12-14 18:15:47 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-14 18:15:47 +0000 |
commit | a481fd31cfcad19e22ef017a240a808e5306b20b (patch) | |
tree | adb3a8479702d35e39e6c1c92d9def261c5dfe8a /tools/aapt2/diff/Diff.cpp | |
parent | 61b0f84005c01dc080821102c402cdf9ebfec993 (diff) | |
parent | c2aed112a79a1f28ed3c5365454cf6773a652915 (diff) |
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours
am: c2aed112a7 -s ours
Change-Id: Icf2354559cf4c0cac6d61d89378b00e9831e9e14
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions