OSDN Git Service

Merge "Skip indexing content while user is locked." into nyc-dev
authorJeff Sharkey <jsharkey@android.com>
Wed, 25 May 2016 18:30:30 +0000 (18:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 May 2016 18:30:30 +0000 (18:30 +0000)
am: c416433a9e

* commit 'c416433a9ee55e2ac44fdb8e6c6d6ca4ed4cde62':
  Skip indexing content while user is locked.

Change-Id: I749bebca289615b2a68fb87e463cadee4fb8840e


Trivial merge