OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4b688c ebd43d4)
am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t...
authorNarayan Kamath <narayan@google.com>
Mon, 27 Jan 2014 12:04:30 +0000 (12:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jan 2014 12:04:30 +0000 (12:04 +0000)
* commit 'ebd43d46ebf53005ae60af59948f8ed634f9bafb':
  AssetManager cookies should be int32_t and not void*.


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