OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d2d911 d5970e9)
am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
authorNarayan Kamath <narayan@google.com>
Mon, 27 Jan 2014 11:58:32 +0000 (03:58 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jan 2014 11:58:32 +0000 (03:58 -0800)
* commit 'd5970e9ca34038051f694c7349fa5f3548ee9499':
  AssetManager cookies should be int32_t and not void*.


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