am e29ef594: (-s ours) Merge from open-source master

Browse Source

* commit 'e29ef594e6836cdeee09de51f3a4b9af11cdabff':
  partial build fix
  partial build fix

...

This commit is contained in:

Jean-Baptiste Queru

2011-01-31 15:19:58 -08:00

committed by Android Git Automerger

parent 9f686c996b e29ef594e6

commit 407b249e78

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