tree 10da860fcff71886af91d082e31f0e1917926848
parent fdf012413aeb4374261632efeb07358ba92c9d7a
parent 253e9df603d89af35765629b9e3fe14283295653
author Tom Stamm <stammt@google.com> 1414566470 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566470 +0000

am 253e9df6: am a0010b81: am 279b0385: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kr

* commit '253e9df603d89af35765629b9e3fe14283295653':