OSDN Git Service

Merge "Daydream -> Screen saver" into nyc-dev am: ea80ebc
authorJason Monk <jmonk@google.com>
Wed, 20 Apr 2016 21:44:08 +0000 (21:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Apr 2016 21:44:08 +0000 (21:44 +0000)
commit36a30814476c1a182c0501af7a7f3721a3b8cfde
treedba77164ce9f6168cfe0661890fe7c2dbeb96367
parentd0ff9d63fa0a4dda099db24bb5923915f9765025
parent040acf7dabbcc9a5673755e86e765298d381ff1d
Merge "Daydream -> Screen saver" into nyc-dev am: ea80ebc
am: 040acf7

* commit '040acf7dabbcc9a5673755e86e765298d381ff1d':
  Daydream -> Screen saver

Change-Id: I5ab92bba5acb4d71118047f3fa5c04593cd8136a