| commit | f8a5820817eb59e0fe16e3ce0f10bb3dca090192 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Thu Apr 24 16:33:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 24 16:33:02 2014 +0000 |
| tree | 49d78fb80f80c15b75f873bbbeaef0ea71b425c3 | |
| parent | 07bed4921a05e717a4b7f10a25e3830e346426b7 [diff] | |
| parent | 03981a4c2e9689197e4d2c916c07ae16207b5276 [diff] |
am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev * commit '03981a4c2e9689197e4d2c916c07ae16207b5276': Add activity attribute allowEmbedded