OSDN Git Service

Merge "Merge "Screen saver string fixes" into nyc-dev am: 990ef94b64 am: 80f32e1dce...
authorJason Monk <jmonk@google.com>
Thu, 21 Apr 2016 16:05:09 +0000 (16:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 16:05:09 +0000 (16:05 +0000)
am: 6f05fd0d25

* commit '6f05fd0d250b1e48af3c48836cb516b2366316ce':

Change-Id: Ib8074c5190942a764c05b041df2bddd91b97b401


Trivial merge