am d7889768: (-s ours) am 07b9b3ad: am b45b39a2: am cdf3455c: am 6dd38cc5: Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later."

Browse Source

* commit 'd7889768b1bbb78e15ddc96575180252f1b4a5cf':

...

This commit is contained in:

Scott Main

2013-12-05 22:44:18 +00:00

committed by Android Git Automerger

parent 8517e7e021 d7889768b1

commit f3392155b6

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