tree 9b9d16dfaded74da356597889544b8575cea3307
parent 0274f0a568fed5aa57d0c40acfb74bea67cba29a
parent 9ee142497e1272697393867be0bccddd758aef35
author Juan Silveira <jjso@google.com> 1395283617 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395283617 +0000

am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '9ee142497e1272697393867be0bccddd758aef35':