tree 10da860fcff71886af91d082e31f0e1917926848
parent b85d116e3ac12d5e8984b81707680eb1edb7ee86
parent 423fe0c6b5b649505bfe240224024c385b6bc2a0
author Adam Cohen <adamcohen@google.com> 1414566082 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566082 +0000

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

* commit '423fe0c6b5b649505bfe240224024c385b6bc2a0':