diff options
author | Dan Willemsen <dwillemsen@google.com> | 2019-05-13 13:48:51 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-13 13:48:51 -0700 |
commit | 7a2519030a1f0ef279cfc0169699a5f3bdc494c1 (patch) | |
tree | e946c3a03a45fc89d6ce706f81cda46541d608d2 /apps/DeviceConfig/res/values-stylus/strings.xml | |
parent | b2a144df273e417caaf3aff63254ca654a276a59 (diff) | |
parent | 6590b8f4bb70d9c212e2cd2b26e9eb7488407fb7 (diff) | |
download | sdk-7a2519030a1f0ef279cfc0169699a5f3bdc494c1.tar.gz |
Merge changes Ia74dd04d,Ib6a6d3feandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13
am: 6590b8f4bb
Change-Id: I7aaa087ebaac6a8ea1f8d6ca778263e6531cc59e
Diffstat (limited to 'apps/DeviceConfig/res/values-stylus/strings.xml')
0 files changed, 0 insertions, 0 deletions