OSDN Git Service

Merge "Restrict Settings always-on to NYC+" into nyc-dev
authorRobin Lee <rgl@google.com>
Mon, 6 Jun 2016 21:09:30 +0000 (21:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 6 Jun 2016 21:09:30 +0000 (21:09 +0000)
commite8fce6d4332e3ee4000d9efb548f5de3bbadb4a8
tree0bbb94cbfa4726f8ff6efcb7874dfae069efd6e7
parent6c52398695164aeba6c3ad8ebc8047ffe98805df
parent8f2c17e12c7cd7c293257c74ac32ab435f58eefe
Merge "Restrict Settings always-on to NYC+" into nyc-dev
am: 8f2c17e12c

* commit '8f2c17e12c7cd7c293257c74ac32ab435f58eefe':
  Restrict Settings always-on to NYC+

Change-Id: Ic79b72b61a763ab7746c1fa07e705e5e2e410bbf