tree f551143a447f0af14f2381a1ea476c21f56be25e
parent 9a5f58427a2b3a5711e5036a4c9c32c5f23f91b0
parent dff8afe1b21c6ffe09269434f9f8f0d166e1a848
author Doug Zongker <dougz@google.com> 1402072077 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402072077 +0000

am dff8afe1: (-s ours) restore holo UI in recovery -- DO NOT MERGE

* commit 'dff8afe1b21c6ffe09269434f9f8f0d166e1a848':
  restore holo UI in recovery -- DO NOT MERGE