tree d773639dfaaf0127283b4494f54a74d44a1e324a
parent 7f4c5f364fcc1a375688c9906b53786208785006
parent 1c13c13722af37a9677b11c9c6b7bfbb6002bab9
author Huy Nguyen <huynguyen@google.com> 1445304662 +0000
committer android-build-merger <android-build-merger@google.com> 1445304662 +0000

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69 am: 8acd2748b2 am: 52599958f4
am: 1c13c13722

* commit '1c13c13722af37a9677b11c9c6b7bfbb6002bab9':