tree 0e7cad72fb0b79626d7fb557dee18f6462acb395
parent 93eed0c03a1f9cd66946760045122516483ba3f0
parent 1a815921694ca2b3ad4dbb85bf82d85e831bc84e
author Nicolas Prevot <nprevot@google.com> 1413277661 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413277663 +0000

Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev