tree fce144cef31654d97ca3bd91c74d0249231cdc91
parent 79cce9f445287c79b785a633fea9a17064147574
parent 6f1bd261b7fd86ac7817ca061dfb55b95150b836
author Eric Laurent <elaurent@google.com> 1296782326 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296782326 -0800

am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycomb

* commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836':
  Fix issue 3371080