Damien Bargiacchi f67b317c10 resolve merge conflicts of 6574d9c to master ...

Change-Id: I9b97396a03f80507d71a52d281f88f686712b129

2016-09-07 20:17:14 -07:00

..

Android.mk

…

audioplay.cpp

…

audioplay.h

…

bootanim.rc

…

bootanimation_main.cpp

…

BootAnimation.cpp

resolve merge conflicts of 6574d9c to master

2016-09-07 20:17:14 -07:00

BootAnimation.h

Allow custom fonts in the boot animaiton zip file

2016-09-05 04:51:45 -07:00

FORMAT.md

…