commit | 3898a06ae064dfe271bde888c7f4ca8319ba4fee | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Oct 20 16:34:35 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 20 16:34:35 2017 +0000 |
tree | b8b6458f71902ec8abef43b8370497a631aa5a2f | |
parent | 1265a3d8962d7fc5476b5d5463d0258ca0677d9e [diff] | |
parent | ef30f73d5aa0bcc84ef936269ae4acb4be87b9c9 [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9fe4ca37b9 -s ours am: ef30f73d5a -s ours Change-Id: Id60b39fadb55f2a8e38d5c803cb88df5e0def573