tree d773639dfaaf0127283b4494f54a74d44a1e324a
parent bf4e852f95d430bcea11e903337ddae07c013572
parent 8dc63a93c64471ea0fdb79d1b216b07fa38799cb
author Juan Silveira <jjso@google.com> 1445304676 +0000
committer android-build-merger <android-build-merger@google.com> 1445304676 +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

* commit '8dc63a93c64471ea0fdb79d1b216b07fa38799cb':