| commit | ec3a0e5ef6a781462f3d30691fe6b929a1260180 | [log] [tgz] |
|---|---|---|
| author | Huahui Wu <hwu@google.com> | Tue Mar 29 13:19:01 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 29 13:19:01 2011 -0700 |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 | |
| parent | 711b114c19bec6f0e8eacfd5f0924ed8b56776e8 [diff] | |
| parent | 98e4ec6578eea0026d7dd002860ea1937f06151d [diff] |
am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE * commit '772f5bb1894710b0f0068d4f34e85ce38becc4b6': DO NOT MERGE