Reconcile with jb-mr1-release - do not merge

Browse source

Change-Id: Ia6cd9f9da1393801f6aeca58eafb6740bae275ca

...

This commit is contained in:

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

parent 6c465d9d26 d4afbf9b98

commit 3666f42b45

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 is not available