tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent 5c02e224552e9df198bd49b4c82906c6078999a2
parent b897ea777eb4b889122a5f2f9604f36ef6ee182f
author Juan Silveira <jjso@google.com> 1445311153 +0000
committer android-build-merger <android-build-merger@google.com> 1445311153 +0000

am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a am: d9ba2b56db am: 8dc63a93c6
am: b897ea777e

* commit 'b897ea777eb4b889122a5f2f9604f36ef6ee182f':