am 51177f0c: (-s ours) Reconcile with jb-mr1.1-release - do not merge

Browse Source

* commit '51177f0c301344296162a8af7cca37990d239e53':

...

This commit is contained in:

The Android Open Source Project

2012-11-06 12:40:09 -08:00

committed by Android Git Automerger

parent 60e3644c6f 51177f0c30

commit 91dee482cc

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