am d668d744: (-s ours) Reconcile with jb-mr2-release - do not merge

Browse Source

* commit 'd668d74408d7c6c71dfbc04e12da7ce1ff9e2af1':

...

This commit is contained in:

The Android Open Source Project

2013-05-16 05:48:19 -07:00

committed by Android Git Automerger

parent 4ebe028d53 d668d74408

commit 5c8acc3903

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