am 1d6e52d1: am 50d36d58: am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse Source

* commit '1d6e52d17e2df913e10925c5e3e652d3421ff320':

...

This commit is contained in:

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

parent 574d6902b7 1d6e52d17e

commit 5c19de4d07

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