tree 64c475eeeb593845bbd1475704f62b4b4eb4b843
parent 3eb34711cd8b2bdaf1fdbd0dafbcc3d469d338b6
parent 546d3cdd7bdb8ed40c04c28074c35a8cea767265
author Geremy Condra <gcondra@google.com> 1362460600 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1362460600 +0000

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