OSDN Git Service

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


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