tree 7d2e8dcb5df1322283eb3cf523ec5a2ab897bb5a
parent a5ec4d4b54440dd7f56661ebf602498d2b08526c
parent 0bf2ed90c42d3a1f1d4be4b70c337f9eaec9cd14
author Jeff Sharkey <jsharkey@android.com> 1379117636 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379117636 -0700

am 0bf2ed90: Merge "Move search to roots; Documents root; hide empty." into klp-dev

* commit '0bf2ed90c42d3a1f1d4be4b70c337f9eaec9cd14':
  Move search to roots; Documents root; hide empty.