| commit | e5a75d1333b92c23cf243af80e62de06a0f9c892 | [log] [tgz] |
|---|---|---|
| author | Nicolas Prevot <nprevot@google.com> | Tue Oct 14 17:51:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 17:51:02 2014 +0000 |
| tree | 38bf1f359b5e319377e688350e63a05d9c0826fc | |
| parent | 584b564df00475966127801a8c8d6560428ac97f [diff] | |
| parent | 20ec9b79f1d98ccbe5b8d4486feaf37a4f80a945 [diff] |
am 20ec9b79: am d8a21bbe: Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev * commit '20ec9b79f1d98ccbe5b8d4486feaf37a4f80a945': Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile.