tree 9b9d16dfaded74da356597889544b8575cea3307
parent fb1a32a63d59d65419e0b0db0124cec445b992cc
parent 32e4344a20c4f9c9323061aaef96678c098d6200
author Mark Ashdown <ashdown@google.com> 1395283620 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395283620 +0000

am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '32e4344a20c4f9c9323061aaef96678c098d6200':