am 3019a5e1: am a8d29082: (-s ours) am d5c8247f: Reconcile with jb-mr2-release - do not merge

Browse Source

* commit '3019a5e1d11eca0d9a8396cf6684f72767eb6d6e':

main

The Android Open Source Project 2013-04-10 19:35:45 -07:00 committed by Android Git Automerger

parent 4c896a2fe8 3019a5e1d1

commit fb899d85ee

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