am 0f1f20f6: (-s ours) am d4803d83: (-s ours) Merge "Cherry picked from c9a94b0f in master. Do not merge." into ics-mr0

Browse Source

* commit '0f1f20f6c3443ffd9d15ebbe9c8f8083a59377d0':
  Cherry picked from c9a94b0f in master. Do not merge.

...

This commit is contained in:

Vladimir Chtchetkine

2011-10-18 13:57:51 -07:00

committed by Android Git Automerger

parent 951560d5eb 0f1f20f6c3

commit 55b4d4e23e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available