tree f4902a14e4915253223ef77d8bf445ae7afbf795
parent 5d5d9562977e73063efc77734ab9577311ac6005
parent 8c2fb9edae4413074186e3d84ccff0eba41b2cae
author Jeff Sharkey <jsharkey@android.com> 1461871307 +0000
committer android-build-merger <android-build-merger@google.com> 1461871307 +0000

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

* commit '8c2fb9edae4413074186e3d84ccff0eba41b2cae':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: I8f54df38e1e165049a87ae505ffaade9de20a21f