OSDN Git Service

Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev
authorOleksandr Peletskyi <peletskyi@google.com>
Wed, 6 Apr 2016 09:36:14 +0000 (09:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Apr 2016 09:36:14 +0000 (09:36 +0000)
commita2810b8eaa09fb85f3265b7479ea7cf63b15f596
treeae273bf091c846820cc42c24b4d05dae4061bff7
parent4c74ed3318a11b9ea6754795188093eee85779f1
parent4ffa5c8af5ad7042e74e3cfddd407ad1161cb544
Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev
am: 4ffa5c8

* commit '4ffa5c8af5ad7042e74e3cfddd407ad1161cb544':
  Block "Screen lock" menu for Work Challenge.

Change-Id: Ifc34a13c1ee69db2e61c4fdf7864ff092a2c97d2