tree b813b9e2e3bb2c429de05c5ac12822af9972c771
parent d5471a0b2bf938cf83f4abac66a18664d8ca5277
parent ca0653a424f9d0f64ad15236c882af2b8ed2fe00
author Craig Mautner <cmautner@google.com> 1424215833 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1424215834 +0000

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