diff options
| author | repo sync <andih@google.com> | 2011-01-12 17:58:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-12 17:58:48 -0800 |
| commit | ae7f6cd0b9d0033ed0a2ded8da56a60ee636552d (patch) | |
| tree | 8227d7736ee78d8901b41b462ae398ec607a1679 | |
| parent | cf97dff7e5d6ed4d80be0f468a43c2360836d439 (diff) | |
| parent | 960737e761895d5850beabab809d03b3621d0ec3 (diff) | |
| download | frameworks_av-ae7f6cd0b9d0033ed0a2ded8da56a60ee636552d.zip frameworks_av-ae7f6cd0b9d0033ed0a2ded8da56a60ee636552d.tar.gz frameworks_av-ae7f6cd0b9d0033ed0a2ded8da56a60ee636552d.tar.bz2 | |
am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
* commit 'd439ac396ecb9e909c543424211d563325fea72b':
DO NOT MERGE: Fix parsing of ntp= PLAY response.
0 files changed, 0 insertions, 0 deletions