am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge

Browse Source

* commit '22384b57bdfee87368417ecc2eb7728fd6f4dd2e':

main

The Android Open Source Project 2013-03-26 12:21:14 -07:00 committed by Android Git Automerger

parent 50cc14b549 22384b57bd

commit 577f08a3d7

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