OSDN Git Service

am aabc3e13: (-s ours) DO NOT MERGE: Hack this copy of our internal sources to match...
authorAndreas Huber <andih@google.com>
Fri, 25 Feb 2011 23:43:02 +0000 (15:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Feb 2011 23:43:02 +0000 (15:43 -0800)
commit4938a42280d1aab3f00179a0de9778a61fca0123
treefa8a922914628f983aaed074cd9c8c69f74a6ebc
parenta5872f770c50da1db555d53e062a9896ea4321d5
parentc3fa37a806d9687b7e3b6a1afd18a6503c43c912
am aabc3e13: (-s ours) DO NOT MERGE: Hack this copy of our internal sources to match changes to support A/V sync.

* commit 'aabc3e13ddf230dd0c9ad5edc0c3eb2687d671cb':
  DO NOT MERGE: Hack this copy of our internal sources to match changes to support A/V sync.