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

Browse Source

* commit 'fd04a7abe7722be94c84e24dc71a2b695e3ddafc':

main

The Android Open Source Project 2012-10-15 07:43:15 -07:00 committed by Android Git Automerger

parent 5cbb130618 fd04a7abe7

commit 3bfe1ce3d0

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