am ca5aae24: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse Source

* commit 'ca5aae2425a88ddc0bdf7f03569848fd67e603d2':

...

This commit is contained in:

The Android Open Source Project 2012-10-11 05:59:16 -07:00 committed by Android Git Automerger

parent 9f997217cf ca5aae2425

commit 8c60e0e365

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