commit | 3149e81730103b411aa56e60f8aa8fa343abb324 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Aug 22 09:20:43 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 22 09:20:43 2019 -0700 |
tree | ea23d2cca4842ac34db2fa1b675740b160788efd | |
parent | 57bdf3420e9f850dbce77b93a77b57b81ab4f095 [diff] | |
parent | fa115507c2048791b0de8d019696c6abe52ae887 [diff] |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours am: b227fad96a -s ours am: 32c8779c92 -s ours am: fa115507c2 -s ours am skip reason: subject contains skip directive Change-Id: I75dc7ab08d89dd53293fbe4ed871508b8738d02a