commit | a3140e32df2fdac2fab3c39bb4fefaad8aa080ad | [log] [tgz] |
---|---|---|
author | android-build-team Robot <android-build-team-robot@google.com> | Fri Apr 27 22:31:07 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Apr 27 22:31:07 2018 -0700 |
tree | 15e6c982a076b4f1a9c8d3a30ca8cc4eb6b7f861 | |
parent | 2d957386f678a50f4e2583b2a3662ca3b1ae7cd2 [diff] | |
parent | 2cafc09ed6e8e43286ae2eb17e3def46ddb3825c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: a282948754 -s ours am: 2cafc09ed6 -s ours Change-Id: Ibd558eb8e97f84c8ad2065ca01b728d48273b1a8