commit | 73d494a1a2f402a3efa8c3715b798f8f7be2ae77 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 09 17:21:25 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 09 17:21:25 2017 +0000 |
tree | 6c6f315d38a888ebf03708907983f0e15e7abfea | |
parent | e4ccad2be671ee9ea25fdee11f9f80a5e05d490f [diff] | |
parent | f7fe3fd8f60b41b09c4290ea5251922fb42421ef [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 44726df826 -s ours am: f7fe3fd8f6 -s ours Change-Id: I140686ea0321b286bc7fc2b8282a84af12f585a1