tree afa28432a95712f8734311d09f3989088fdbd446
parent e8a30577f7451ed0f50ce7cd86e0d3f0c0e0d0bc
parent df3ac430b137f194f51b3c8ad814fa96223a9a7f
author Adam Cohen <adamcohen@google.com> 1405715448 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1405707865 +0000

Merge "Specify permission.RECEIVE_LAUNCH_BROADCASTS in String resource" into ub-now-master