tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 4c5dbc52b3415966720f83c1a95a0b9fb3928b8f
parent 6120e6096a2c3457817c618642a1166fec0dbd89
author Juan Silveira <jjso@google.com> 1445302490 +0000
committer android-build-merger <android-build-merger@google.com> 1445302490 +0000

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

* commit '6120e6096a2c3457817c618642a1166fec0dbd89':