| commit | 684bbd8668db5a7378d88d90921fd7103baba164 | [log] [tgz] |
|---|---|---|
| author | Nicolas Prevot <nprevot@google.com> | Tue Oct 14 19:04:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 19:04:25 2014 +0000 |
| tree | f6df1ae68f9905d6f4b3a03b8de76792c20e9489 | |
| parent | f152525db967dcc5f906eb0d109e7cf6a20a2279 [diff] | |
| parent | e5a75d1333b92c23cf243af80e62de06a0f9c892 [diff] |
am e5a75d13: am 20ec9b79: am d8a21bbe: Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev * commit 'e5a75d1333b92c23cf243af80e62de06a0f9c892': Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile.