tree 648b1d3d905516553b8a4d7062ab5a96d317d54b
parent 6dd41a990ecf03ea4c0488aea851632f318e6297
parent 1e1cffe9ae8fdacd83456c3e16589bc2d970cd1b
author Esteban Talavera <etalavera@google.com> 1426893239 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426893239 +0000

am 1e1cffe9: am dc282036: am 9c8f4b85: Merge "Update string value for managed provisioning action" into lmp-dev

* commit '1e1cffe9ae8fdacd83456c3e16589bc2d970cd1b':