commit | c9c029623ec3b49b830230e52a2fb9fba9df3f58 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Jun 16 15:31:08 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 16 15:31:14 2017 +0000 |
tree | 6c053c3d293c5473b1cdafb73a1c4bdd9f1c08fd | |
parent | 9f32651e25fe1fff34a6db0b4c5ec6da97be4af4 [diff] | |
parent | 98fc4f2571260189ebebda3528b408a423e4827b [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: d97c62a1da -s ours am: 0c4e13b41d -s ours" into oc-dr1-dev-plus-aosp