am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp

Browse Source

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

...

This commit is contained in:

repo sync

2011-01-12 17:58:48 -08:00

committed by Android Git Automerger

parent 91412cec42 d439ac396e

commit b2d782d084

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available