diff options
author | Xin Li <delphij@google.com> | 2018-08-13 18:48:48 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-13 18:48:48 -0700 |
commit | 2cc811f2811572281b09ed382e1b123730384636 (patch) | |
tree | ef3e30fbb74489510baaf6c8e58139be6005ffa0 /res/values-ca | |
parent | e097b9768b9d9bcc0e2109aba0fbc53f3da9de01 (diff) | |
parent | e9441d8b92ce8449ce5e3cc2fa3b8567e798ffd3 (diff) | |
download | PhotoTable-2cc811f2811572281b09ed382e1b123730384636.tar.gz |
Merge stage-dr1-aosp-master into stage-aosp-master am: a7d8aa354d
am: e9441d8b92
Change-Id: I231bfd52867133060836e16f9bdf87a1a837a79b
Diffstat (limited to 'res/values-ca')
0 files changed, 0 insertions, 0 deletions