OSDN Git Service

Merge "Adding a new string array resource for network recommendations." am: 54710df28d
authorJeremy Joslin <jjoslin@google.com>
Wed, 7 Dec 2016 01:34:46 +0000 (01:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Dec 2016 01:34:46 +0000 (01:34 +0000)
commit472d5ecb5faee1ca7706410abbb6776f52891d71
tree926160bea7dbf453c5a5bb2fca9d4111c732621d
parentf5795bcf543bf3091b0b8ad43b4287b534e746da
parentea968e411c855c68984551e1cfa2d5f27d35e095
Merge "Adding a new string array resource for network recommendations." am: 54710df28d
am: ea968e411c  -s ours

Change-Id: I32b30b622e71c782deb21c627b33f23422c3d3ad