| commit | fff6e8e0c2d611c7126d43efb8cae3e814db93d6 | [log] [tgz] |
|---|---|---|
| author | Derek Sollenberger <djsollen@google.com> | Wed Sep 01 08:31:02 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 01 08:31:02 2010 -0700 |
| tree | df31c43417ea691a070cf0dad43f8384279dda51 | |
| parent | c92de67da33cecc0795902af543c8ff5db57f9c0 [diff] | |
| parent | 0171bfba04af5964f8863e334df3ed072a9675ef [diff] |
am 0171bfba: (-s ours) am 73ef5d4e: DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365. Merge commit '0171bfba04af5964f8863e334df3ed072a9675ef' * commit '0171bfba04af5964f8863e334df3ed072a9675ef': DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.