tree 073dd2d70d3235c600cfb71b41879edad18bba3d
parent 9527831e86964208584b247ea826a6793df21f0e
parent 7b3e9bd825901e33661e3c385e3e7c6f40ca6000
author Alex Sakhartchouk <alexst@google.com> 1300335730 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300335730 -0700

am 6ff211e0: am 8f6c5226: am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1

* commit '6ff211e08a7c5d51e3899d10be53878c05c244b5':
  Fix for bug 3434228