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

Browse Source

* commit 'e0ad4582ba0ff711137674dc35d207f835d62af8':

...

This commit is contained in:

The Android Open Source Project

2012-10-09 07:35:40 -07:00

committed by Android Git Automerger

parent ced865f736 e0ad4582ba

commit ddc709cf15

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