tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 289ef0823cd781b257c077699207a4e17c73e2fe
parent 121d725e10313eb0d182ed5a8aa29a07cd6919b9
author Adam Cohen <adamcohen@google.com> 1392411500 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411500 +0000

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

* commit '121d725e10313eb0d182ed5a8aa29a07cd6919b9':