| commit | 20ec9b79f1d98ccbe5b8d4486feaf37a4f80a945 | [log] [tgz] |
|---|---|---|
| author | Nicolas Prevot <nprevot@google.com> | Tue Oct 14 09:19:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 09:19:49 2014 +0000 |
| tree | 0e7cad72fb0b79626d7fb557dee18f6462acb395 | |
| parent | 20bc8c19b655a9b1416f7aa698ebd3d5e6c21dd9 [diff] | |
| parent | d8a21bbedbaeb752b7f458823ed709b9a01c14c1 [diff] |
am d8a21bbe: Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev * commit 'd8a21bbedbaeb752b7f458823ed709b9a01c14c1': Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile.