tree c1733219a0653c63256bac16387d7166f723926d
parent 616facd74bea28fd88c2da240159cd87ec1972a5
parent 3f39cc45d8b0e5a6cb3fa2ebe70af9aeb1af8085
author Juan Silveira <jjso@google.com> 1445301249 +0000
committer android-build-merger <android-build-merger@google.com> 1445301249 +0000

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

* commit '3f39cc45d8b0e5a6cb3fa2ebe70af9aeb1af8085':