am 9edb2a35: (-s ours) am 0503ac42: (-s ours) am 6093b8ef: am 24616eff: (-s ours) am e6098b20: (-s ours) am 265861dc: (-s ours) am 82c852cb: (-s ours) am b528e251: (-s ours) Reconcile with jb-mr2-release - do not merge

Browse Source

* commit '9edb2a35c430168cabaa1c9ad48c8a6f315d8fa5':

main

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

parent 9c11b9b7ad 9edb2a35c4

commit ed60c5f33c

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