tree cba62d0d64153aa2169651696bc238591341d679
parent a42634a571557f0826c519488a8c53c784abb952
parent a0010b81ad0e179a8336f84da84f7aed3dd54cb5
author Tom Stamm <stammt@google.com> 1414092451 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414092451 +0000

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

* commit 'a0010b81ad0e179a8336f84da84f7aed3dd54cb5':