| commit | 89a11e5d5c3210359679e6f211444e0d7240ae0a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jan 14 21:30:16 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 14 21:30:16 2011 -0800 |
| tree | ee2a98411c7acb707e419675795504cf7aec6547 | |
| parent | e76ca5e0f1cd7b5417ed5bc05ef4cbe968e8197e [diff] | |
| parent | 9286cfe5017363d95798d85163ec4f28aeb0c675 [diff] |
am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge * commit '9286cfe5017363d95798d85163ec4f28aeb0c675': Squash commits of the following patches, cherry-picked from other branch - do not merge.