commit | 051c6dba16ba19246ce93046890a89d79822a7f3 | [log] [tgz] |
---|---|---|
author | Daisuke Miyakawa <dmiyakawa@google.com> | Sun Sep 26 14:15:40 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 26 14:15:40 2010 -0700 |
tree | 6cccfecfa56dd21426dedb3e383d9b24207af368 | |
parent | 68c3099922cab1c797528b1013412718628fd06c [diff] | |
parent | b643cbe55852b01f1ab81da76d841b58d890276a [diff] |
am b643cbe5: (-s ours) am e0998604: Add necessary logic removed during backport Merge commit 'b643cbe55852b01f1ab81da76d841b58d890276a' * commit 'b643cbe55852b01f1ab81da76d841b58d890276a': Add necessary logic removed during backport