| commit | b00eaba2ef41f89b294b33e6da4de42db1a8650f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:22:47 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:22:47 2012 -0800 |
| tree | 036fc67e22a88e970ee56315a82f3aecb0217eab | |
| parent | fc4fd42dd99ae0fd58428e2769078db304c1f675 [diff] | |
| parent | 0c01c2bd07b311019d5adea606a6c4b10f9335ba [diff] |
am 0c01c2bd: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '0c01c2bd07b311019d5adea606a6c4b10f9335ba':