| commit | 5200114fe8c1c1503176c891230200bf8d5ec632 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Sep 01 17:03:23 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 01 17:03:23 2010 -0700 |
| tree | c90d3a848663402c9d77db36088aeb09fa236095 | |
| parent | 3e115b81a46b849a2b556f5f1202a56bf4884619 [diff] | |
| parent | 4c7c2f73af773872faf5a65167d74900865d96ba [diff] |
am 4c7c2f73: (-s ours) am 532c8600: Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3 Merge commit '4c7c2f73af773872faf5a65167d74900865d96ba' * commit '4c7c2f73af773872faf5a65167d74900865d96ba': Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3