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

Browse Source

* commit '9ef024ec8ae0318c89cc65dc0591aa40695393fc':

...

This commit is contained in:

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

parent f53f9c6d36 9ef024ec8a

commit 4ddcb75861

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