OSDN Git Service

Merge remote-tracking branch 'cyanogenmod/gb-release-7.2' into jb-x86-monami
authorMasaki Muranaka <monaka@monami-ya.jp>
Wed, 14 Aug 2013 18:13:22 +0000 (03:13 +0900)
committerMasaki Muranaka <monaka@monami-ya.jp>
Wed, 14 Aug 2013 18:13:22 +0000 (03:13 +0900)
Conflicts:
Android.mk

1  2 
Android.mk

diff --cc Android.mk
Simple merge