tree cba62d0d64153aa2169651696bc238591341d679
parent 216a53f0b12c048a531dd7bdf3a02f59e18a808d
parent 07130d400c52518e413e58334525f1598c3b8f1a
author Juan Silveira <jjso@google.com> 1445300881 +0000
committer android-build-merger <android-build-merger@google.com> 1445300881 +0000

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

* commit '07130d400c52518e413e58334525f1598c3b8f1a':