OSDN Git Service

Merge "Daydream -> Screen saver" into nyc-dev
authorJason Monk <jmonk@google.com>
Wed, 20 Apr 2016 17:56:04 +0000 (17:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Apr 2016 17:56:04 +0000 (17:56 +0000)
commit040acf7dabbcc9a5673755e86e765298d381ff1d
tree673b19e7f3da7821e6263dc9253473b3e1d6b5f0
parent4d1954f71faf34f7995702cdd9fb3a5e1342841c
parentea80ebcd92c94d99f22279101ee2bdc27499b55b
Merge "Daydream -> Screen saver" into nyc-dev
am: ea80ebc

* commit 'ea80ebcd92c94d99f22279101ee2bdc27499b55b':
  Daydream -> Screen saver

Change-Id: I2536df1ef2c588a70f3820b15efda3b2fa366cae