| commit | c7081bdb42feeea7c1cff5d023ac97f350a13903 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 28 09:49:32 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 28 09:49:32 2012 -0800 |
| tree | fee0682385fce1717f808e3567baf12f219b1891 | |
| parent | 8d746c735e21df217ef42a30f67963879550dc0c [diff] | |
| parent | ed2e86b6df846f913d5fded1e3ff6ae6843cfe4c [diff] |
am ed2e86b6: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'ed2e86b6df846f913d5fded1e3ff6ae6843cfe4c':