tree 84237f2a5dd6517d5eb1b6aeb28491a30547a077
parent 9e380fb8d1f002d592a89679dc77f9d1c9864691
parent 4ee33795c4117647267fbbc6d2529161f931b309
author Sudheer Shanka <sudheersai@google.com> 1466815125 +0000
committer android-build-merger <android-build-merger@google.com> 1466815125 +0000

Merge \"Add a resource for demo mode launcher component name.\" into nyc-mr1-dev
am: 4ee33795c4

Change-Id: Ib5d7aef5453afbd0468da7adfc99055d082d7e23