tree 57e49da0b90565c76a1394b8a875fc22e9ae0369
parent b1c730f2b3e41cc7a6718db654b28ca8cc7fc86b
parent 2d0d704ac8c58438e3849de75c12edb371980668
author Mindy Pereira <mindyp@google.com> 1365535921 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365535921 -0700

am 2d0d704a: am 567f6456: am d5c5e621: Merge "Rather than change the text, just remove the waiting for entries row." into jb-dev

* commit '2d0d704ac8c58438e3849de75c12edb371980668':