am 0ec54854: am 774abe7b: Cherry-pick 49f1857d from master. do not merge.

* commit '0ec5485484e0667fb48bee32197b2c2e0669adf4':
  Cherry-pick 49f1857d from master. do not merge.
This commit is contained in:
Tom Marlin 2011-06-14 14:33:38 -07:00 committed by Android Git Automerger
commit 55b8a474c3

Diff Content Not Available