tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 53fd6d102511e5d3e8d49fe1f8c7a1e3316aa2c9
parent fc6fd5fe01d6598663ccf3a5420763f3bae628c7
author Adam Cohen <adamcohen@google.com> 1392410112 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410112 +0000

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

* commit 'fc6fd5fe01d6598663ccf3a5420763f3bae628c7':