OSDN Git Service

Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc...
authorSudheer Shanka <sudheersai@google.com>
Wed, 20 Apr 2016 22:20:33 +0000 (22:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Apr 2016 22:20:33 +0000 (22:20 +0000)
commit12d5de97053ddc9e81f769e82f37286fd1d98cf3
treeec60154b2cf92e7a2e1957204155218cd114691a
parent08b7add2607acbe41b9e5d8cde94f56bf77df140
parent5a80da4bd102a2f5f7f04539d8c622be2479af26
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev am: b2f161a
am: 5a80da4

* commit '5a80da4bd102a2f5f7f04539d8c622be2479af26':

Change-Id: I2766a5a5b526ea3c19369daf0f2751f4e543c7e6