| commit | d96951562d644a6dd18a0a8d6c566ea85c35a338 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:21:35 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 06 13:21:35 2012 -0700 |
| tree | b0a743c4de41fc198725c34f138b922bd4910f59 | |
| parent | 5140a03d786aa4f9d3a1daf062374b9dea629327 [diff] | |
| parent | 50531071da987d051a222ea5c5e595011fc8629a [diff] |
am 50531071: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '50531071da987d051a222ea5c5e595011fc8629a':