tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 6060c10580453fcc74b6e6c49c3eccb16f3c46cc
parent 94b7ee378f29b5539559019d35ba96734cf66692
author Huy Nguyen <huynguyen@google.com> 1445303598 +0000
committer android-build-merger <android-build-merger@google.com> 1445303598 +0000

am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399
am: 94b7ee378f

* commit '94b7ee378f29b5539559019d35ba96734cf66692':