OSDN Git Service

am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
authorrepo sync <andih@google.com>
Thu, 13 Jan 2011 01:58:48 +0000 (17:58 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jan 2011 01:58:48 +0000 (17:58 -0800)
commitcd3bf6ab65e907d3684aec529bc0044e364a9e26
treece50eb6bba60bceaefaef8e9954948100d83362b
parent4d55db3c88ff5b3aec63d3266d4f587fa4d79664
parent4bbc09c0e3b5220913f24320c3619547bc703e8f
am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp

* commit 'd439ac396ecb9e909c543424211d563325fea72b':
  DO NOT MERGE: Fix parsing of ntp= PLAY response.