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

Browse Source

* commit '7d091828d937fd7895a20026a81fec9981ad0717':
  JDP66
  JDP65

...

This commit is contained in:

The Android Open Source Project 2012-12-05 13:00:48 -08:00 committed by Android Git Automerger

parent 19cc22bc9c 7d091828d9

commit c88dea4ebe

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 Not Available