tree 6d9742bd92769ff3760a727a8df440ba31e27af6
parent a188bfaee7d55b56a9adfd84ad313f12f8f43103
parent ced87aed0e1e18e7d47a998d153ae405e7028eb8
author Geremy Condra <gcondra@google.com> 1362462586 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362462586 +0000

am ced87aed: Merge "Convert mEntries -> entries, fixing the build." into jb-mr1-dev-plus-aosp

* commit 'ced87aed0e1e18e7d47a998d153ae405e7028eb8':
  Convert mEntries -> entries, fixing the build.