tree cdee6876faa1c56d2e0ec3dc0cfb51f2913372db
parent 17de4b2a73996366ff3d7759793a6809654caebe
parent 3d1933c45fe9ba2389ebd166d96abeceab1971d1
author Dianne Hackborn <hackbod@google.com> 1434137918 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1434137919 +0000

Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev