tree d773639dfaaf0127283b4494f54a74d44a1e324a
parent 1df97e4e4b2cd1ca83f125131bf59eddc1008bb7
parent 8c9ef49ae5a10e011d214cede771042434f28691
author Huy Nguyen <huynguyen@google.com> 1445304653 +0000
committer android-build-merger <android-build-merger@google.com> 1445304653 +0000

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2 am: ab3847b8b3 am: 0cce0579a3
am: 8c9ef49ae5

* commit '8c9ef49ae5a10e011d214cede771042434f28691':