tree 884a12f11300b308d263c0a8175f44bd648e0ddc
parent 5055589269409be8d2c70d11ba8d681fd627df92
parent 69a0645eb2025c54232c4b65544db581a183c1e7
author Winson Chung <winsonc@google.com> 1412183391 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412183391 +0000

am 69a0645e: am d1c1201d: am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev

* commit '69a0645eb2025c54232c4b65544db581a183c1e7':
  Fixing regression with black task bar background. (Bug 17584337)