tree 893cffe99a7daf89da23f5ef9ef070fb5a097894
parent 9a4ac8c599ad917ba65caad3c0b086f1291c1aff
parent 116547900686614ad31d66bd2895213b56963fc3
author Alex Sakhartchouk <alexst@google.com> 1300335637 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300335637 -0700

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

* commit '8f6c5226c5a0522cf2bbad987004e362098d9464':
  Fix for bug 3434228