am 5c8f84a1: am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse source

* commit '5c8f84a15fba998baf9703c81e86a25048ce368a':

...

This commit is contained in:

Jean-Baptiste Queru 2013-03-11 12:32:00 -07:00 committed by Android Git Automerger

parent 4c645d0a9b 5c8f84a15f

commit 6e5236ee08

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 is not available