tree bae0261489cb8bc5225fab74d4d27fb23fc7c538
parent 9d6f408ab5a3fc12a1cae2ffba928c79df74739c
parent 8fc600d1a8fc4f9cedceee185d129a19b06001c5
author Erik Kline <ek@google.com> 1414486443 +0000
committer android-build-merger <android-build-merger@google.com> 1414486443 +0000

Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev automerge: dd91fb4
automerge: 8fc600d

* commit '8fc600d1a8fc4f9cedceee185d129a19b06001c5':
  (re)define the definition of "provisioned"