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

Browse Source

* commit 'ed7bc2fa007ced0587672428b788dc4bb9c2451f':

...

This commit is contained in:

The Android Open Source Project

2013-05-29 08:10:37 -07:00

committed by Android Git Automerger

parent 731b4c3eb4 ed7bc2fa00

commit 7a001b3e9f

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