tree 09bc2c070ee8b84bcd07d3f479283083dc69c665
parent 779da6444640c2ece962c942b6e967d12e92fd52
parent f8dd04e1a5f94e7accf65a5375114ac7fa73f828
author Elliott Hughes <enh@google.com> 1423769432 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423769432 +0000

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

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