OSDN Git Service

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
authorJuan Silveira <jjso@google.com>
Tue, 20 Oct 2015 00:28:01 +0000 (00:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 00:28:01 +0000 (00:28 +0000)
am: 07130d400c

* commit '07130d400c52518e413e58334525f1598c3b8f1a':


Trivial merge