am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: am c4176236: (-s ours) am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge

Browse Source

* commit 'b2c2ce310cdb3218b5198f4135a8dfac0d9c14cb':

main

The Android Open Source Project 2013-04-03 19:28:15 -07:00 committed by Android Git Automerger

parent 046a311a13 b2c2ce310c

commit 5517262476

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