tree acced9a6724c1836441fb161cf8b3c7fd38063ba
parent a29e05012db02c4ed87eb8c31c2138e966f742b5
parent ab868effb7a54bc6a6b2d35412fe466c0adc7f55
author Rubin Xu <rubinxu@google.com> 1438794058 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438794058 +0000

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

* commit 'ab868effb7a54bc6a6b2d35412fe466c0adc7f55':
  Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE