am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse Source

* commit 'f4b1aefbaafba7ba290a05bce84f77ee5ad5b043':

...

This commit is contained in:

Jean-Baptiste Queru

2013-03-11 12:42:01 -07:00

committed by Android Git Automerger

parent a374d81605 f4b1aefbaa

commit 9cff5e3f4a

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