tree 77fd98ec62a0cf3e501cfd54ed616ec63ae4d7cb
parent 80cb73006d6c14f9a9cd506172d9223cbca8606f
parent 5a1cec86cfb3f08fac06ed26fe81247c3415d3ca
author Bart Sears <bsears@google.com> 1425517141 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425517141 +0000

am 5a1cec86: am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev

* commit '5a1cec86cfb3f08fac06ed26fe81247c3415d3ca':
  Do not make ActivityContainer available to apps. DO NOT MERGE