| commit | 42b6957036812b4c6fb005828a33a46438ace009 | [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 | 2aa2cb6936c908494527967d2b865eaf6392b787 | |
| parent | 409496a3068e25d2e945e81dd54827345067ba14 [diff] | |
| parent | decffc4e2fcb9da751eaee79200aee05684b144a [diff] |
am 515a08b0: Merge 59aad78e from master. do not merge. * commit '515a08b01851a1ab9386f85dee6d9fd7b65ee7ad': Merge 59aad78e from master. do not merge.