tree aa30072c5a8ea071cc9bdfa6acd048b9fa869cc6
parent 20b153bffc57711534c0f581258e06fa86afd67a
parent 377b21e9f531e3fec1a5849453f886b5462e4144
author Android (Google) Code Review <android-gerrit@google.com> 1249325664 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1249325664 -0700

am 377b21e9: Merge change 9502 into donut

Merge commit '377b21e9f531e3fec1a5849453f886b5462e4144'

* commit '377b21e9f531e3fec1a5849453f886b5462e4144':
  Fix bug 2025765.