tree b439229ab3455ce703fb5e2b14f65418dc8f6b4f
parent 06c964d9b31ac81d3521f97427cdab77ee7d1cff
parent 6410c8c4097f1a3246aa3d03b3291d47f982bc4b
author Andy McFadden <fadden@android.com> 1381528045 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381528045 -0700

am 6410c8c4: Merge "Use black for blackout layer" into klp-dev

* commit '6410c8c4097f1a3246aa3d03b3291d47f982bc4b':
  Use black for blackout layer