tree c028bfe537607823c37e2ffc8c713c73059d3130
parent ed0c3623a9e4e99735149384c43fbb1f23888986
parent d9ba2b56dbb70f04310f87228a25b3cf04587d2f
author Juan Silveira <jjso@google.com> 1445303589 +0000
committer android-build-merger <android-build-merger@google.com> 1445303589 +0000

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

* commit 'd9ba2b56dbb70f04310f87228a25b3cf04587d2f':