am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse Source

* commit 'c14a7fbd895aed1ce34c0682ece5ef361f21dd1c':

...

This commit is contained in:

Jean-Baptiste Queru

2013-03-11 12:19:04 -07:00

committed by Android Git Automerger

parent aa0dbb25a0 c14a7fbd89

commit 1c302cafdd

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available