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

Browse Source

* commit '2d1bdcf6d591a3014b6ee5c583246ae3fd9603eb':

main

The Android Open Source Project 2012-10-02 09:24:48 -07:00 committed by Android Git Automerger

parent c3aea8ea9f 2d1bdcf6d5

commit 8e01cc768d

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