commit | e06f74af73942d04911a14331993fcea99164e1a | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Wed May 25 18:58:20 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 25 18:58:20 2016 +0000 |
tree | e71f775bd335c49582f6d94823a89b2037e35061 | |
parent | 11afb18c3de01b10a64555b4c10529d9b10842f8 [diff] | |
parent | a592e55e5ff8e7b4e799745f076888e6bbbcdf55 [diff] |
Merge "Skip indexing content while user is locked." into nyc-dev am: c416433a9e am: a592e55e5f * commit 'a592e55e5ff8e7b4e799745f076888e6bbbcdf55': Change-Id: Ie64ecbe217deec122560d62b94816c92e5970301