| commit | f13d41cbaa83aca8a063058b7af8ca7c1d6ba8a5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 10 09:45:41 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 10 09:45:41 2012 -0700 |
| tree | c03690ea4de3712537dd83db030464e65c8a4bbc | |
| parent | a8e4a6d043d3bc5b272d310e9154691117df0c02 [diff] | |
| parent | 0cf0f743d35ee09f76bf954a39c91c626b89a023 [diff] |
am 0cf0f743: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '0cf0f743d35ee09f76bf954a39c91c626b89a023':