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

Browse Source

* commit '2dafd362c7052f1618b0d22d18043d99f4544ac0':

...

This commit is contained in:

The Android Open Source Project

2013-05-23 08:06:41 -07:00

committed by Android Git Automerger

parent 99f40d4758 2dafd362c7

commit 624191ecd8

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