OSDN Git Service

Merge "Fix lockdown string" into pi-dev
authorChad Brubaker <cbrubaker@google.com>
Tue, 20 Mar 2018 19:30:27 +0000 (19:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Mar 2018 19:30:27 +0000 (19:30 +0000)
am: 91b6d17b8d

Change-Id: I70c2f9cb56da14cd56e0b799b3b815bd54642bad


Trivial merge