| commit | 76cec53f3b7af7e6591e527cc080d9f25ff72457 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 10 09:51:09 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 10 09:51:09 2012 -0700 |
| tree | d29ee126f3baa6caa56faca09f99f91df734099f | |
| parent | 6ae5e45118ecc7bc29fe4050286055ba30d144cd [diff] | |
| parent | f5d3ea7291739898130d91682908bd916642ffbd [diff] |
am f5d3ea72: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'f5d3ea7291739898130d91682908bd916642ffbd':