tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent 982cbc361cf5d7104a5ab046550112c9eb569004
parent f5e5e1270d7186ccbca50a8515145d01c5cf2689
author Juan Silveira <jjso@google.com> 1445311291 +0000
committer android-build-merger <android-build-merger@google.com> 1445311291 +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
am: f5e5e1270d

* commit 'f5e5e1270d7186ccbca50a8515145d01c5cf2689':