OSDN Git Service

Merge \"docs: Narnia 2 advertising language update\" into nyc-dev
authorJoe Fernandez <joefernandez@google.com>
Mon, 20 Jun 2016 20:22:05 +0000 (20:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 20 Jun 2016 20:22:05 +0000 (20:22 +0000)
am: ebad16f3c0

Change-Id: Iafe2096dc792ff57a4a9065e88916c7ca7330e79


Trivial merge