diff options
author | Adam Lesinski <adamlesinski@google.com> | 2015-07-21 21:43:32 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-21 21:43:32 +0000 |
commit | 26bfaa5c9737807b8fbed71a30cf433ac55ff9e2 (patch) | |
tree | 52858f46f452b047c3f5097b301d887f0400905b /libs/hwui/renderthread/DrawFrameTask.cpp | |
parent | d795d4ffcbb78a61880e5821c899bdccd880f5ce (diff) | |
parent | 208d273edcaa59470fa1a83d96b0b3cd036dbbf1 (diff) |
am 208d273e: am e1cd38e9: am ca34b184: am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
* commit '208d273edcaa59470fa1a83d96b0b3cd036dbbf1':
BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
Diffstat (limited to 'libs/hwui/renderthread/DrawFrameTask.cpp')
0 files changed, 0 insertions, 0 deletions