am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse Source

* commit 'a4b20d712b9c6cbc562529d3a41bf8ea1515562a':

...

This commit is contained in:

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

parent 940e4c9d92 a4b20d712b

commit 7915b22e8f

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