tree 558baea7c3968cdac4ec7ce9edc7e5e640179c88
parent ff1e7ad9d0554c71966bc0391e27552c39f0a0b5
parent 6b6b9cd911104020e8af2250fd531d2ccc344c69
author Rubin Xu <rubinxu@google.com> 1438796348 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438796348 +0000

am 6b6b9cd9: am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev

* commit '6b6b9cd911104020e8af2250fd531d2ccc344c69':
  Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE