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:50:17 +0000 (01:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Dec 2016 01:50:17 +0000 (01:50 +0000)
am: 9347a4f38f  -s ours

Change-Id: I14d558a02bfd5617e0e04427e23bc2c4f000d88f


Trivial merge