tree 723e957dea01d9fb790fb2d0ce2f0c6f25e6f20b
parent 05f1ab8ceee67b9e89f36a713e04509d6f6d8934
parent 77b9074f3d835682d66fe18e0768639745c34239
author Tsu Chiang Chuang <tsu@google.com> 1345750472 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345750472 -0700

am 77b9074f: Backport from master.

* commit '77b9074f3d835682d66fe18e0768639745c34239':
  Backport from master.