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

Browse Source

* commit '2fb2c487c13340e0384aec1514ebe56617f397a7':

...

This commit is contained in:

The Android Open Source Project

2012-11-28 09:49:33 -08:00

committed by Android Git Automerger

parent b18661d334 2fb2c487c1

commit a714c33d2f

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