OSDN Git Service

Merge tag 'android-4.4.4_r2' into kitkat-x86 kitkat-x86 android-x86-4.4-r2 android-x86-4.4-r3
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 27 Aug 2014 10:35:20 +0000 (18:35 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 27 Aug 2014 10:35:20 +0000 (18:35 +0800)
commit59204263bcb85c07198c800fe4b4570588b71852
tree2bcc1ad0e2defb1a49b48f102422df85118f677f
parent35533af230d1cf2d7f07a77968b72ad64364a39a
parent36e356c96640775f0a3f167bd2426ea0f0093b8b
Merge tag 'android-4.4.4_r2' into kitkat-x86

Android 4.4.4 Release 2

Conflicts:
vm/JarFile.cpp