tree 43c783e665b9e1c47210d3c5a8f929b33acda72f
parent 19e323aa5cd46b33f32c35ca73ad7d2df0b16bb2
parent bb1f5e1e83b14753722c6cb986da576e30107dd5
author Jean-Michel Trivi <jmtrivi@google.com> 1250039479 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1250039479 -0700

am 1e1b6b72: Merge change 20514 into donut

Merge commit '1e1b6b7245a0a9212aa3b0366e7919f114895306'

* commit '1e1b6b7245a0a9212aa3b0366e7919f114895306':
  Fix bug 2022435.