OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a394610 4cd2b34)
am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function...
authorJean-Baptiste Queru <jbq@google.com>
Tue, 24 Jan 2012 23:15:36 +0000 (15:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Jan 2012 23:15:36 +0000 (15:15 -0800)
* commit '4cd2b343272429adae1fc68e0ec0628c69e88e6d':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe


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