tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 2b7c979feed2d29c5a64c458a2d4d563efd614a5
parent 6b7a3523f4c458d81e251dbb76e6baf3734a328c
author Adam Cohen <adamcohen@google.com> 1392410975 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410975 +0000

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

* commit '6b7a3523f4c458d81e251dbb76e6baf3734a328c':