tree 723e957dea01d9fb790fb2d0ce2f0c6f25e6f20b
parent fd27c860abbf870f818fac47ac8715133d2eca13
parent 47e0cef87666634660eef34273875ebd54654862
author Tsu Chiang Chuang <tsu@google.com> 1345750790 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345750790 -0700

am 47e0cef8: am 77b9074f: Backport from master.

* commit '47e0cef87666634660eef34273875ebd54654862':
  Backport from master.