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

Browse source

* commit '94a155a41a562db983e4aa9c51bbeb39438885de':

...

This commit is contained in:

The Android Open Source Project 2013-05-23 08:06:40 -07:00 committed by Android Git Automerger

parent 8f0e6de6c7 94a155a41a

commit 55ca246b2c

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 is not available