Merge "resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp" into gingerbread-plus-aosp

Browse source

...

This commit is contained in:

Jean-Baptiste Queru 2011-07-12 15:01:26 -07:00 committed by Android (Google) Code Review

parent a38ec2b7d4 97814ab2a3

commit 3415d41107

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

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available