am 20807343: (-s ours) am 3a1eb8fc: (-s ours) Cherry-pick 7fb4cc from master. do not merge.

* commit '2080734362f7b6e361e9dff825464ccf56b492f6':
  Cherry-pick 7fb4cc from master. do not merge.
This commit is contained in:
Xavier Ducrohet
2011-09-22 23:42:37 -07:00
committed by Android Git Automerger

Diff Content Not Available