OSDN Git Service

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

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

Change-Id: I4e21ab2ede02223f76728dc89a0a2af2ff564dcb


Trivial merge