tree 9b9d16dfaded74da356597889544b8575cea3307
parent 5cc929caa0922e0b80dbf3f6c099d841c3797c20
parent 6508fe1b07ec888012255e3a2438382b45a9707f
author Anton Hansson <hansson@google.com> 1395283616 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395283616 +0000

am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '6508fe1b07ec888012255e3a2438382b45a9707f':