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)
commitd386838f92acf59eec0da43a483512be9c89c1dd
tree69a2daf322cd0dac246067dc295087d59006793a
parentccc66c59e2f5ca9af3671d34eed21c15a1e7889e
parenta10f7f066bc40432ed2b682439ec2c0df8d7a4da
Merge remote-tracking branch 'cyanogenmod/gb-release-7.2' into jb-x86-monami

Conflicts:
Android.mk