OSDN Git Service

Merge changes from topic 'cps' into nyc-dev
authorJulia Reynolds <juliacr@google.com>
Wed, 25 May 2016 17:09:24 +0000 (17:09 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 25 May 2016 17:09:26 +0000 (17:09 +0000)
commitd3827be1620a8cb3bb1dfa42d07334f3be4382ef
treea1b2f8a17d4a46005e629716797bdddf20d04bc3
parentf4ae9977190d4d406ec5e2aaddb78ea84873f1f0
parentad41a6f0def1dfef9fb5ad1a7bed355760eed6be
Merge changes from topic 'cps' into nyc-dev

* changes:
  Api updates.
  Note timezone changes.