am cf0c1a7d: am 19289df5: am e279de02: (-s ours) am ab6fa041: am e72a088f: am a6dcb55e: (-s ours) am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge

Browse Source

* commit 'cf0c1a7d6ea4f05c46addde2bfd961abcff656f8':

main

The Android Open Source Project 2013-04-17 19:44:04 -07:00 committed by Android Git Automerger

parent 1996320a72 cf0c1a7d6e

commit 740243cb69

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