| commit | d7542263c6dfa2522e8844c7c714fbf2ad112385 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Jun 28 18:56:17 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 28 18:56:17 2011 -0700 |
| tree | c2e941e5492128808d6951a2f584e68a3e369e2c | |
| parent | adf5914b390061e48a86c9f55e68899cfa526841 [diff] | |
| parent | 155cf6c1e191bb03fe24db8663715862d8e6a43d [diff] |
am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread * commit '155cf6c1e191bb03fe24db8663715862d8e6a43d': CherryPick 988eeeb5 from hc-mr1. do not merge.