| commit | e0650ebb1e4d08d2e883e14aebdcf59df6fd1dbd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 07 10:24:19 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 07 10:24:19 2012 -0800 |
| tree | 37713ee1d614cf6364363bfb9a090cfa98ad46dc | |
| parent | c82ab0216264ca82a62ed4cdda387b23c0d8c1c7 [diff] | |
| parent | d48f14fc02114e90c8212cf6302aae4793491c42 [diff] |
am d48f14fc: Reconcile with jb-mr1-release - do not merge * commit 'd48f14fc02114e90c8212cf6302aae4793491c42':