am a6caaa2e: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge

Browse Source

* commit 'a6caaa2e0a0699f6538a2e922228c027dd78499f':

...

This commit is contained in:

The Android Open Source Project

2012-11-27 08:22:29 -08:00

committed by Android Git Automerger

parent 26cb353457 a6caaa2e0a

commit ba2c0087fb

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