am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse Source

* commit '99a7231d50daaacbdb35513b327b475d4de44e3f':

main

Jean-Baptiste Queru 2013-03-11 13:00:40 -07:00 committed by Android Git Automerger

parent db6f21c679 99a7231d50

commit 7b52eac491

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