commit | c5513aad58f12e61509c857f3b9a00949567558b | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Jun 08 13:40:27 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 08 13:40:27 2016 +0000 |
tree | cd80ae297e9957c857aaa379424a6ec991931856 | |
parent | 2e12167173a522bd837c667b29a6df2725af6748 [diff] | |
parent | a6e9d057122b6d496676f0a3ffde066483418de9 [diff] |
Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: c20ea2eb43 -s ours am: 26e9a5c9f8 -s ours\" into nyc-mr1-dev-plus-aosp am: a6e9d05712 -s ours Change-Id: If9a2e515ef9a06bce71928783d14f06fac0697ca