edit conflict
authorKasin Lee <kasin.li@amlogic.com>
Fri, 20 Sep 2013 12:52:57 +0000 (20:52 +0800)
committerKasin Lee <kasin.li@amlogic.com>
Fri, 20 Sep 2013 12:52:57 +0000 (20:52 +0800)
commitc0e1fae215481b9151b3fb1aeaefa22d9b4bf745
treee53b477320f150ecc22d7a42190d7abafbd7737c
parent3e9315406df8eb72010acdda2b5e539201464c07
parent0c6d1655aa853ba83d646010072f8e8e584b3ddd
edit conflict
mali/platform/meson8/meson_main.c