| commit | e9f44fb66e805fd99735ccc3540e5f5e44b51fcd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 28 09:46:43 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 28 09:46:43 2012 -0800 |
| tree | fc9a2bfebc358e6fa45c4c218c0ab3e28b154604 | |
| parent | bb40eab34a5eded59eab171b36cd9667ccf030a3 [diff] | |
| parent | 9b2ef2237229ca1ce38df2d54550985ec5f7fdaf [diff] |
am 9b2ef223: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '9b2ef2237229ca1ce38df2d54550985ec5f7fdaf': JDP81B