| commit | fee8d78ce8e1177a1d1ef59f34fde2319470c07f | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Apr 07 14:18:20 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 07 14:18:20 2011 -0700 |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 | |
| parent | f3eae4d6b86a788289ed79fbdda9ee7ef09275a3 [diff] | |
| parent | 42b6957036812b4c6fb005828a33a46438ace009 [diff] |
am 96ac8560: am 515a08b0: Merge 59aad78e from master. do not merge. * commit '96ac85607b1462508981936b1be29ae5f9e4271d': Merge 59aad78e from master. do not merge.