| commit | 50a8a71f0b84ca279d780fd227970b551f079fb6 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@android.com> | Mon Aug 17 14:11:31 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 17 14:11:31 2009 -0700 |
| tree | 42fdf22f18dc4097c2f86cbd691fe6b1c8bd3820 | |
| parent | 60151a295ccf726238dc47456d80b427db6d6a38 [diff] | |
| parent | 54e2e86c5740a2c7a02e95e94c4aff362a5502cf [diff] |
am 54e2e86c: (-s ours) do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch Merge commit '54e2e86c5740a2c7a02e95e94c4aff362a5502cf' * commit '54e2e86c5740a2c7a02e95e94c4aff362a5502cf': do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch