tree b9b1dd959f4a5588b801b97657ed2456848729eb
parent 62e7d26a0c267ac76f641a17e66e4f9c11b887c9
parent ad0ce3ab5ec6ec1d7f4d8ac0341e386968b1572b
author Jorim Jaggi <jjaggi@google.com> 1461788724 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461788726 +0000

Merge "Use FLAG_RECEIVER_FOREGROUND for lock intent" into nyc-dev