tree 8958581fa5991ec8f3536764faf42cc57d463c36
parent 2a6cbf292fbe9b0ddbee2c867617478a6a1cccc1
parent 218339818ccb7a92d338496b51dbc194933c6f76
author Vinit Deshpande <vinitd@google.com> 1372810372 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1372810373 +0000

Merge "Revert "Temporarily disable 'Scan Always' mode"" into jb-mr2-dev