tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent c314292efc6a0561af311dbbde90a24129c3d605
parent 8d9f5baea199ac79746d1467a5838b8a21dc040d
author Juan Silveira <jjso@google.com> 1445306726 +0000
committer android-build-merger <android-build-merger@google.com> 1445306726 +0000

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3 am: a379acb1cb am: 28c9e80cc0 am: abe2da3ed1 am: 67e3373948
am: 8d9f5baea1

* commit '8d9f5baea199ac79746d1467a5838b8a21dc040d':