tree 7493315f05acfb9ae8c8aca96c80122ece77657e
parent 014442c28eae214af56f4c1fe3e0c21d5b091d25
parent ab8f60e425a90045eca06c09f0274f402b062d8f
author Craig Mautner <cmautner@google.com> 1424216613 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424216613 +0000

am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev

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