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

Browse Source

* commit 'c1d6374aed994ac68b010e5118f5256d645192c1':

...

This commit is contained in:

The Android Open Source Project 2012-12-07 07:58:15 -08:00 committed by Android Git Automerger

parent 98487fee9f c1d6374aed

commit 90561c60b6

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