tree cba62d0d64153aa2169651696bc238591341d679
parent b7b834bde170c2b444e0b031f5ec703620252240
parent 8dc2ca68c1ccf1570caec3e52c2671b323cf7102
author Huy Nguyen <huynguyen@google.com> 1445300908 +0000
committer android-build-merger <android-build-merger@google.com> 1445300908 +0000

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

* commit '8dc2ca68c1ccf1570caec3e52c2671b323cf7102':