tree 0f82420197a3a9b4d98b1ce84bc40aa81b615e0e
parent f0e9d712b5461bdb8b487e9fa6f981fa4fe02a2f
parent f9dbae88419bc5bb272a41cceadd1b4e318f5572
author Ruchi Kandoi <kandoiruchi@google.com> 1456176245 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456176245 +0000

Merge "dumpstate: Remove deprecated /proc/wakelocks" into nyc-dev