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

Browse Source

* commit '0f84e5d2ecd0df20387ffe877067f66eda7232eb':

main

The Android Open Source Project 2012-08-22 15:40:02 -07:00 committed by Android Git Automerger

parent 14dcfd41bc 0f84e5d2ec

commit 49bac97f7e

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