am 4011770f: merge from open-source master

Browse Source

Merge commit '4011770f2d06fcb743abc91a01a531c7ae2d9175'

* commit '4011770f2d06fcb743abc91a01a531c7ae2d9175':

...

This commit is contained in:

Jean-Baptiste Queru 2009-10-14 16:11:42 -07:00 committed by Android Git Automerger

parent 31f0fc2235 4011770f2d

commit f88cea6ded

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 Not Available