tree 8ecfc234ce90db4bafd2849ecbfb758da6e6c817
parent 5b31253fe29bb22bbcfa12f83adab6bba72f00b9
parent edb48993842d47edaf75975258b3b3bf5a8ea48a
author Vikram Aggarwal <viki@google.com> 1348701151 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348701152 -0700

Merge "Rename USER_QUERY -> LIVE_QUERY" into jb-mr1-dev