tree 02a1278ee12fbcf3dd816af0dfad9faa3904fe7a
parent 717e94fd429702d98f7118ca03391794d39d7e4e
parent 35c6f6c70a22987d0166500909f21d4d339dd1ae
author Jeff Sharkey <jsharkey@android.com> 1461871778 +0000
committer android-build-merger <android-build-merger@google.com> 1461871778 +0000

Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae
am: 35c6f6c70a

* commit '35c6f6c70a22987d0166500909f21d4d339dd1ae':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: Id285c9fa289daad5c272ae7ca35d696c389c9168