Mathias Agopian a0d128c8c6 resolved conflicts for merge of de36313b to master

2009-07-28 15:42:53 -07:00

..

Android.mk

rename libsgl/libcorecg to libskia

2009-07-10 15:33:21 -04:00

bootanimation_main.cpp

resolved conflicts for merge of de36313b to master

2009-07-28 15:42:53 -07:00

BootAnimation.cpp

am e640d259: Merge change 8832 into donut

2009-07-28 15:27:25 -07:00

BootAnimation.h

merge master to master_gl

2009-05-22 02:16:08 -07:00