am d15e80d6: (-s ours) am 1b770503: (-s ours) Reconcile with jb-mr1.1-release - do not merge

Browse Source

* commit 'd15e80d6e2c32d4342e9e0b0d05305032f19c51a':

main

The Android Open Source Project 2012-12-14 16:53:03 -08:00 committed by Android Git Automerger

parent 18bfb1be7c d15e80d6e2

commit 3e6d4d0311

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