OSDN Git Service

Merge "Fixed an issue where groups could stay userlocked" into oc-dev
authorSelim Cinek <cinek@google.com>
Thu, 25 May 2017 03:38:01 +0000 (03:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 May 2017 03:38:01 +0000 (03:38 +0000)
am: e736807efd

Change-Id: I8d2bdf59d406985ac336eddcf8f868a985f30612


Trivial merge