OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87d49d8 13bea64)
am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread
authorJames Dong <jdong@google.com>
Thu, 15 Jul 2010 18:18:53 +0000 (11:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 15 Jul 2010 18:18:53 +0000 (11:18 -0700)
Merge commit 'd6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp

* commit 'd6a85a21418338a7797bff731fa7a551f62a9e86':
  Support user-supplied timescales for authoring


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help