tree a02b04fc12b8fafe12f7e92d8fbae23224477c54
parent 450013a90b46abc4cb5819b0659de9fad81968f8
parent 6df3bc1da5fe8602468d02b896d1c18b60d797da
author Adam Cohen <adamcohen@google.com> 1380220296 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380220296 -0700

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

* commit '6df3bc1da5fe8602468d02b896d1c18b60d797da':
  Whiten all the things