tree d89e9626ae07a96f110987fc4a2dad431ae02e91
parent adf71bf71d0c3ecb68375c44fc8646860217024c
parent ff934d0257909e9c5420815547a6e2ff89455314
author Elliott Hughes <enh@google.com> 1423762931 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423762931 +0000

am ff934d02: Merge "Fix Droid and animation color in recovery mode"

* commit 'ff934d0257909e9c5420815547a6e2ff89455314':
  Fix Droid and animation color in recovery mode