tree cba62d0d64153aa2169651696bc238591341d679
parent 1bd8f7e4607eb43c153c6bdc9285f42a32bdc200
parent 149268d8698f316a70cce2515e7787334e62d23d
author Huy Nguyen <huynguyen@google.com> 1445300961 +0000
committer android-build-merger <android-build-merger@google.com> 1445300961 +0000

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am: 149268d869

* commit '149268d8698f316a70cce2515e7787334e62d23d':