tree 8dfd5fc7a1c768c32bbc9991859be2f8ad1752f7
parent 2d9e5440ef937c860b4771aaa3b6f406615eb8d2
parent 87b0438aed11ed7f5e7cc442a5300eb5f20ebdc5
author Eric Laurent <elaurent@google.com> 1295548529 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295548529 -0800

am 4dcaeb6d: am 404946fc: Merge "Fix issue 3371096." into honeycomb

* commit '4dcaeb6d776bc87469a97001a223099c8e805579':
  Fix issue 3371096.