diff options
| author | Craig Mautner <cmautner@google.com> | 2015-02-17 23:36:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-17 23:36:35 +0000 |
| commit | c9f7a17ac7188ab002998d1c0c1b6c192b51e58b (patch) | |
| tree | a24b2a90a885668e35cac010841284219d6885bf /core | |
| parent | 12c2d3fecfc18d8edc205a9579a31f8fc91fa98b (diff) | |
| parent | a94e42970d4e664e193cde0cf2700cb7e15961c9 (diff) | |
| download | frameworks_base-c9f7a17ac7188ab002998d1c0c1b6c192b51e58b.zip frameworks_base-c9f7a17ac7188ab002998d1c0c1b6c192b51e58b.tar.gz frameworks_base-c9f7a17ac7188ab002998d1c0c1b6c192b51e58b.tar.bz2 | |
am a94e4297: (-s ours) Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit 'a94e42970d4e664e193cde0cf2700cb7e15961c9':
Do not make ActivityContainer available to apps. DO NOT MERGE
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions