tree dc00c34fe21c4b8fbd3bbdc7d29ee49e80406a66
parent b6f64041d1ed356a5fa1bdcee77f4dc8dee6c13d
parent 0215f0f11162ab5f1f89907f9d258c7f432c56c3
author Android (Google) Code Review <android-gerrit@google.com> 1249579191 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1249579191 -0700

am 3efbdf6f: (-s ours) Merge change 20267 into donut

Merge commit '3efbdf6f253f905c8672108a6329886105edec7c'

* commit '3efbdf6f253f905c8672108a6329886105edec7c':
  Do not merge