| commit | 280cc6655812689a84584b1689555f6d50787a3c | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Sep 22 23:39:44 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 22 23:39:44 2011 -0700 |
| tree | 0f0ba32f1bc72f10ddb1392ae7d3100f0effd558 | |
| parent | 6eb7db42634b24ff858892fa62a760edbc918655 [diff] | |
| parent | 4d2b9bf341e7978225d6a305c2524ff79f2d18c5 [diff] |
am 4d2b9bf3: (-s ours) Cherrypick 6de7bc61 from master. do not merge. * commit '4d2b9bf341e7978225d6a305c2524ff79f2d18c5': Cherrypick 6de7bc61 from master. do not merge.