OSDN Git Service

Merge "Adding a new string array resource for network recommendations." am: 54710df28...
authorJeremy Joslin <jjoslin@google.com>
Wed, 7 Dec 2016 01:42:22 +0000 (01:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Dec 2016 01:42:22 +0000 (01:42 +0000)
am: 472d5ecb5f  -s ours

Change-Id: Ifa31e990cf70eb861588f1cf1f4539fe0cc78319


Trivial merge