| commit | 408e944d03b55b2da0ae81e50bd9d0367a8fde6a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:34:13 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:34:13 2012 -0800 |
| tree | 72eb425348bf7d44b464f26200dd514baa12a75a | |
| parent | 6f785ea12297e7464c3bfa8b3074ff0b7fc9c2db [diff] | |
| parent | 69747880790a89feb80fe231a814f21b1bc0485e [diff] |
am 69747880: (-s ours) am a12b114c: am fcc33af6: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '69747880790a89feb80fe231a814f21b1bc0485e':