Elliott Hughes 7d6f9a2274 resolve merge conflicts of 93fdd252d2 to stage-aosp-master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia98bcfb2dcc8bb45fbec4e2fb354fb1c6bea8ae8

2019-07-31 15:55:26 -07:00

..

Android.bp

Remove product_is_iot.

2019-07-31 19:45:51 +00:00

audioplay.cpp

[BootAnimation] Modernize codebase by replacing NULL with nullptr

2019-03-24 01:49:02 -07:00

audioplay.h

…

bootanim.rc

Revert^3 "Delay start of bootanimation until after the Runtime APEX is mounted."

2019-03-12 22:33:44 +00:00

bootanimation_main.cpp

Preload zip before waiting for surface flinger

2019-02-14 13:37:34 -08:00

BootAnimation.cpp

Merge "Fix bootanimation stack overflow"

2019-07-22 19:57:21 -07:00

BootAnimation.h

Preload zip before waiting for surface flinger

2019-02-14 13:37:34 -08:00

BootAnimationUtil.cpp

…

BootAnimationUtil.h

…

FORMAT.md

…