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

Browse Source

* commit '4a1a8c6ae738e7aefc67327ddcf87be5df072e5d':

main

The Android Open Source Project 2012-10-03 07:40:20 -07:00 committed by Android Git Automerger

parent 2bd719692c 4a1a8c6ae7

commit 928d570c7f

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