| commit | 9d9663557d999a532f62ecc63537f01f16ba1ca1 | [log] [tgz] |
|---|---|---|
| author | Huahui Wu <hwu@google.com> | Tue Mar 29 13:44:53 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 29 13:44:53 2011 -0700 |
| tree | c282f284a6dd557f7e5e48e0f923c407f1fac4c7 | |
| parent | 0eef04126a42658d9f36a9647b5e48c01ae2c822 [diff] | |
| parent | 69aa3e41a346e0c2251e0e972152dcbbd015c169 [diff] |
am 69aa3e41: (-s ours) am 604a598e: DO NOT MERGE * commit '69aa3e41a346e0c2251e0e972152dcbbd015c169': DO NOT MERGE