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

Browse Source

* commit 'adff4e8630e8d468253255b521caecfbb161dbbe':

...

This commit is contained in:

The Android Open Source Project 2013-03-05 15:58:51 +00:00 committed by Android Git Automerger

parent 3f794facd3 adff4e8630

commit 69a278f679

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