| commit | 125b7c567ab9a99b4982e31914ba2ad8b5cb3819 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Jan 16 10:44:01 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jan 16 10:44:01 2011 -0800 |
| tree | 12855a24a50fa5a97fbaa3f551b387940ec087de | |
| parent | 10cd7e1d15f2a347763d8b7897ffe6a4bd5e7911 [diff] | |
| parent | f9c1f51b261d45632625b501f44f2b2214ce3352 [diff] |
am 89a11e5d: (-s ours) am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge * commit '89a11e5d5c3210359679e6f211444e0d7240ae0a': Squash commits of the following patches, cherry-picked from other branch - do not merge.