| commit | 96ac85607b1462508981936b1be29ae5f9e4271d | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Apr 07 13:38:13 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 07 13:38:13 2011 -0700 |
| tree | f515b26ea4f8a4cfec73583fda12a4f01b59e5bc | |
| parent | 70c3d1c23b5d4398cc561ec9ddbe868b3182cc74 [diff] | |
| parent | 515a08b01851a1ab9386f85dee6d9fd7b65ee7ad [diff] |
am 515a08b0: Merge 59aad78e from master. do not merge. * commit '515a08b01851a1ab9386f85dee6d9fd7b65ee7ad': Merge 59aad78e from master. do not merge.