tree cba62d0d64153aa2169651696bc238591341d679
parent 61172868fde38da7f7ec8dcb84288d51095948e1
parent d0642c4274abcbede9177d61b0f072689db889a9
author Anton Hansson <hansson@google.com> 1445300875 +0000
committer android-build-merger <android-build-merger@google.com> 1445300875 +0000

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

* commit 'd0642c4274abcbede9177d61b0f072689db889a9':