tree cba62d0d64153aa2169651696bc238591341d679
parent 5c597e4abaec26e4fa715f93f0f7db688cc07d0d
parent 0274f0a568fed5aa57d0c40acfb74bea67cba29a
author Anton Hansson <hansson@google.com> 1445300926 +0000
committer android-build-merger <android-build-merger@google.com> 1445300926 +0000

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

* commit '0274f0a568fed5aa57d0c40acfb74bea67cba29a':