am de784d91: (-s ours) Cherrypick 3bfbbe2 from master. do not merge.

* commit 'de784d913123376a886b5e8c4e619b7f87484c5f':
  Cherrypick 3bfbbe2 from master. do not merge.
This commit is contained in:
Wink Saville
2011-09-29 17:03:24 -07:00
committed by Android Git Automerger

Diff Content Not Available