tree cba62d0d64153aa2169651696bc238591341d679
parent 346da07c80e2691060df29f66878cb63542fcf21
parent fb1a32a63d59d65419e0b0db0124cec445b992cc
author Huy Nguyen <huynguyen@google.com> 1445300950 +0000
committer android-build-merger <android-build-merger@google.com> 1445300950 +0000

am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am: fb1a32a63d

* commit 'fb1a32a63d59d65419e0b0db0124cec445b992cc':