Reconcile with jb-mr1-release - do not merge

Browse Source

Change-Id: Ia1f59a486efa98614b8f97f9432e1040c90d2ec7

...

This commit is contained in:

The Android Open Source Project 2012-08-02 11:26:02 -07:00

parent 8f2f246618 248321bb6f

commit d7b3cc0c69

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