commit | 253e9df603d89af35765629b9e3fe14283295653 | [log] [tgz] |
---|---|---|
author | Tom Stamm <stammt@google.com> | Thu Oct 23 19:27:31 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 19:27:31 2014 +0000 |
tree | cba62d0d64153aa2169651696bc238591341d679 | |
parent | a42634a571557f0826c519488a8c53c784abb952 [diff] | |
parent | a0010b81ad0e179a8336f84da84f7aed3dd54cb5 [diff] |
am a0010b81: am 279b0385: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kr * commit 'a0010b81ad0e179a8336f84da84f7aed3dd54cb5':