OSDN Git Service

Merge remote-tracking branch 'cyanogenmod/gb-release-7.2' into jb-x86-monami honeycomb-x86 ics-x86 jb-x86 kitkat-x86 android-x86-4.4-r1 android-x86-4.4-r2 android-x86-4.4-r3
authorMasaki Muranaka <monaka@monami-ya.jp>
Wed, 14 Aug 2013 17:55:32 +0000 (02:55 +0900)
committerMasaki Muranaka <monaka@monami-ya.jp>
Wed, 14 Aug 2013 17:55:32 +0000 (02:55 +0900)
Conflicts:
Android.mk


Trivial merge