tree a02b04fc12b8fafe12f7e92d8fbae23224477c54
parent 0e980e4fe9e951a321750ba6695a31a126912ce3
parent 98928dbed8796458b71b6a89bc48b62d8faf1c7b
author Adam Cohen <adamcohen@google.com> 1380220104 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380220104 -0700

am 98928dbe: Merge "Whiten all the things" into jb-ub-now-indigo-rose

* commit '98928dbed8796458b71b6a89bc48b62d8faf1c7b':
  Whiten all the things