| commit | dccfbd0d9d72b9515f93b172cb6e23deb1448c38 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 26 10:07:56 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 10:07:56 2012 -0700 |
| tree | ee8bec834a49fef96808d91b8149132627989bcc | |
| parent | 237ded1a59b1fc148a3ffcf78d6f9d34af5c170c [diff] | |
| parent | c21368dfa8800b48887e19b16eff24ed12fcd358 [diff] |
am c930ef0a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c930ef0a3ed04ef8eed499e4146a1cb09c2443a4':