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

Browse Source

* commit '6d93da465ab8fff02728f268785e59ab86a2a0c2':

...

This commit is contained in:

The Android Open Source Project 2012-11-29 09:49:34 -08:00 committed by Android Git Automerger

parent e402f1fde2 6d93da465a

commit 2b556bc988

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