| commit | df327d854c1d5e70fe2568eee232e9033439ccee | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Tue Feb 01 13:27:08 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 01 13:27:08 2011 -0800 |
| tree | 0d2eb630507f0bb075d58d837df55c2c0f90e793 | |
| parent | c7503436df6634bf14f4e3297d1389e26e608628 [diff] | |
| parent | 1501492cfb30aa6f2907661b6240acf8f7a260e1 [diff] |
am 1501492c: (-s ours) am f0f3e98f: DO NOT MERGE * commit '1501492cfb30aa6f2907661b6240acf8f7a260e1': DO NOT MERGE