| commit | 97621525c54057550dc40b38dcbe03de70cadd87 | [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 | d81220182b52788497da14fb7a943cc4f7a2e5aa | |
| parent | 7d5ae7537858d6b01ae2ce12e34cb0a284138ccf [diff] | |
| parent | 772f5bb1894710b0f0068d4f34e85ce38becc4b6 [diff] |
am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE * commit '772f5bb1894710b0f0068d4f34e85ce38becc4b6': DO NOT MERGE