OSDN Git Service

Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev
authorSudheer Shanka <sudheersai@google.com>
Wed, 20 Apr 2016 18:02:35 +0000 (18:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Apr 2016 18:02:35 +0000 (18:02 +0000)
am: b2f161a

* commit 'b2f161ab389469c7029efe4915aef06e9671ffdb':
  Apply policy transparency to "Stay awake" in Development settings.

Change-Id: I22816dad3b6a96d36062f395847eec36db205363


Trivial merge