OSDN Git Service

Merge "Use FLAG_RECEIVER_FOREGROUND for lock intent" into nyc-dev
authorJorim Jaggi <jjaggi@google.com>
Wed, 27 Apr 2016 20:41:16 +0000 (20:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Apr 2016 20:41:16 +0000 (20:41 +0000)
am: af77082

* commit 'af77082a22135381180e031392b58a5ba8f5bb67':
  Use FLAG_RECEIVER_FOREGROUND for lock intent

Change-Id: Id834e315a2edb889da2c7824fca9e1854467dfe9


Trivial merge