tree fc70c588bff21dee63fdc0349425351cb23c9525
parent 458a64fba02c240d80b5186be9f27af7a605b80e
parent 005294a8f692bf12d644e7dbd4b48035500cdc2e
author Jeff Sharkey <jsharkey@android.com> 1461872051 +0000
committer android-build-merger <android-build-merger@google.com> 1461872051 +0000

Merge "Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae am: 35c6f6c70a" into nyc-mr1-dev-plus-aosp
am: 005294a8f6

* commit '005294a8f692bf12d644e7dbd4b48035500cdc2e':

Change-Id: Ie660066e4a5009184fc6c6d10e0c9d5c33c67a66