OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13bd4ac a0c6260)
am a0c62607: AssetManager cookies should be int32_t and not void*.
authorNarayan Kamath <narayan@google.com>
Mon, 27 Jan 2014 18:42:06 +0000 (10:42 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jan 2014 18:42:06 +0000 (10:42 -0800)
* commit 'a0c6260705c841f501282e0e337970ca9a00e064':
  AssetManager cookies should be int32_t and not void*.


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