| commit | 1f359b58135c9078011a44ede05baef362e1feac | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 07 11:05:49 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 07 11:05:49 2012 -0700 |
| tree | 6d2f2ddd8169f8477154a1bc4a85dd0eeb10486b | |
| parent | e90b7d5b28bb4c192be215f64269d23c9ed6c102 [diff] | |
| parent | 0624f9120951494881236195237b94a96838db6f [diff] |
am 0624f912: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '0624f9120951494881236195237b94a96838db6f':