am 9047063f: (-s ours) Reconcile with jb-mr1-release

Browse Source

* commit '9047063fa7620b3a5c1993b7908bd6e4297fc00f':

main

The Android Open Source Project 2012-07-30 15:25:44 -07:00 committed by Android Git Automerger

parent d567ec4f00 9047063fa7

commit 83878fe59b

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