Jeff Tinker 267803d2c5 resolve merge conflicts of 907e26c to master ...

Change-Id: I9dc9f6943192fe2d39d87f0405953b63794123bc

2016-06-17 15:36:23 -07:00

..

strings.xml

resolve merge conflicts of 907e26c to master

2016-06-17 15:36:23 -07:00