am 6a1e1b4c: (-s ours) am 39e82fb5: am c9e08527: (-s ours) am 87fa6995: (-s ours) am f8ce1ffa: (-s ours) am eb724ddb: (-s ours) am 7f78bd5e: (-s ours) Reconcile with jb-mr2-release - do not merge

Browse Source

* commit '6a1e1b4ccd3e69538a212efaf5ff1089d3aa54d4':

main

The Android Open Source Project 2013-10-03 16:07:56 -07:00 committed by Android Git Automerger

parent b3f48fb16a 6a1e1b4ccd

commit 76319e9ad1

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