commit | 90713bcfdb0f110116a99bd69d9ade74d76eedf2 | [log] [tgz] |
---|---|---|
author | Grace Kloba <klobag@google.com> | Thu Jan 21 17:57:07 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 21 17:57:07 2010 -0800 |
tree | b0507a63755050546c50e1f613ec664e89062a44 | |
parent | a24ffc285418f21253bf33ccb7ec3747f48151e3 [diff] | |
parent | b8d4b14257b049e2475631ad1f006f6f5d03fc04 [diff] |
am 55d791e7: (-s ours) am 5a0bf1f0: DO NOT MERGE Merge commit '55d791e74eaa8c80b965075d6debc1cfd7bde99a' * commit '55d791e74eaa8c80b965075d6debc1cfd7bde99a': DO NOT MERGE