commit | 44b4244f9b4a56684292ca406e47b44fedaf68f6 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed May 22 20:45:22 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 22 20:45:22 2019 -0700 |
tree | 91fc2ff7eb23ebb65455ad1bda51105c1afe2661 | |
parent | 6a4a1ad7559b745ca97f4ab33e2981f3cd9ae8b3 [diff] | |
parent | 6e936043cf8db9bfbf2699ac43bcd71daaf019ba [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 1328f9015a -s ours am: d5e671d32a -s ours am: ce0549992e -s ours am: 6e936043cf -s ours am skip reason: subject contains skip directive Change-Id: Ibb0905e19b985f56d4bfeeb8b40061f12124d26e