OSDN Git Service

Merge "Merge "Make "work mode on dialog" show personal challenge in unified work...
authorRicky Wai <rickywai@google.com>
Mon, 25 Apr 2016 13:30:35 +0000 (13:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 13:30:35 +0000 (13:30 +0000)
commitf2acbcae9f3a7f2b9742f8c5e172a17e60e70603
treed33dfd793cde2200f82c08c99361726be691a473
parent75374dbbd50f3bcb7c45e0050c04ef6eb0f822bc
parent5e4a6bbdc1aba5b463500bcbe70088d89cb3e10d
Merge "Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am: 4ace836 am: eeec588" into nyc-mr1-dev-plus-aosp
am: 5e4a6bb

* commit '5e4a6bbdc1aba5b463500bcbe70088d89cb3e10d':

Change-Id: Iba8198dbb84dc0f811003c25ac951c635f35afd0