| commit | f5ad2f9c204870a1f4dc95449774aab8d141674f | [log] [tgz] |
|---|---|---|
| author | repo sync <andih@google.com> | Wed Jan 12 18:03:26 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 12 18:03:26 2011 -0800 |
| tree | 43a10dd1809c46c1a4ddffad6a4120b018651eec | |
| parent | ebccf76cebe40667f9fc6d1317a6ae010dc82735 [diff] | |
| parent | ae7f6cd0b9d0033ed0a2ded8da56a60ee636552d [diff] |
am b2d782d0: (-s ours) am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp * commit 'b2d782d084fd8859ccd582ebd6bc38d947370b99': DO NOT MERGE: Fix parsing of ntp= PLAY response.