OSDN Git Service

Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
authorMaurice Lam <yukl@google.com>
Wed, 16 Aug 2017 08:04:41 +0000 (08:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 Aug 2017 08:04:41 +0000 (08:04 +0000)
commit2dad90da4b722c2adac7dc778f2ecb178836d8be
tree8dfac38c598162597d75345937ac6427aded8f4e
parenteee0e82fbab866a7939db08ef3713e3f6964de33
parent0ece5f2a06e6fba99218f145e3b203374510f6b2
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
am: 0ece5f2a06

Change-Id: Ib00277edf9edc35fbb0c279f1e103c02c0e508fc