commit | 530bcd817a822a81208c08dddfc3761a87f18cc2 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Jul 13 22:49:21 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Jul 13 22:49:21 2019 -0700 |
tree | 5fc92f94166edb70c3e79e0bd64200e9ff0a6b17 | |
parent | 442c90cebd38203ce3263170bbfd16c3b9e89dbe [diff] | |
parent | 24d4024df1dcb7fdb685aae33fa3d7e2b467be6d [diff] |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: cdd65daaa1 -s ours am: e3d501996e -s ours am: 24d4024df1 -s ours am skip reason: subject contains skip directive Change-Id: I31c84a13ebde95fffa104e7d21aeed4398df5e65