OSDN Git Service

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


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