Reconcile with jb-mr2-release - do not merge

Browse Source

Change-Id: I8e30c075ddfaf3712aacd89a2a90c30ea245193a

main

The Android Open Source Project 2013-06-03 14:04:12 -07:00

parent 6f7e39a682 2d2519d9e2

commit 0532b398ad

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