OSDN Git Service

Merge "Lock all the things" into oc-dev
authorJulia Reynolds <juliacr@google.com>
Tue, 18 Apr 2017 19:21:51 +0000 (19:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Apr 2017 19:21:51 +0000 (19:21 +0000)
am: 7e4e923a8c

Change-Id: Iee7b299db15a6d6ada863b2fddbad9dfed3b700d


Trivial merge