| commit | 481d9eaba432863916c96b7bff940fab3cf3cff1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 14 12:44:58 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 14 12:44:58 2012 -0800 |
| tree | 4304a5951c9ea5766357c2c5197c1147eaa1f46b | |
| parent | 0353b14cd4d7738cd5d5930884dcdca83383bafd [diff] | |
| parent | acbdb76a6bf9953e8e80bd59a41f456c27ddfa25 [diff] |
am acbdb76a: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'acbdb76a6bf9953e8e80bd59a41f456c27ddfa25':