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

Browse Source

# Via The Android Automerger (8) and The Android Open Source Project (1)
* commit 'aee2de934d55c27f695d8fb10b775718871ecbd7':

...

This commit is contained in:

The Android Open Source Project

2013-02-05 13:52:43 -08:00

committed by Android Git Automerger

parent c163c606f6 aee2de934d

commit d36aa68ea2

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