OSDN Git Service

Merge "Update demo mode time" into nyc-dev
authorJason Monk <jmonk@google.com>
Thu, 12 May 2016 18:34:42 +0000 (18:34 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 12 May 2016 18:34:43 +0000 (18:34 +0000)

Trivial merge