tree de403ca5cf329c0ce39578219b39d61266a3e706
parent 55f2a8a8b597e18116b3eef1b4bd1ee7afba5fed
parent 9711521e3c0cd6777b8a2ca8e632a180a21c551c
author Jorim Jaggi <jjaggi@google.com> 1467328238 +0000
committer android-build-merger <android-build-merger@google.com> 1467328238 +0000

Merge \"Fix ugly flash between boot animation and setup wizard (1/2)\" into nyc-mr1-dev
am: 9711521e3c

Change-Id: Ibe1410573df0d661ae62e45ff798bfbcc0079a1a