commit | 1be1113161e85fda8127dbb5b066c01f7d8892dd | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 30 21:57:47 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:57:47 2016 +0000 |
tree | 94b0baa2df3b1ae37225948a0f746b04d9e96838 | |
parent | 5c8b2fabfe13c2397b82441863f8069087629299 [diff] | |
parent | 5fac8299e15c914589c7b6ee472c8aa71aa61d35 [diff] |
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: f7fe0be6a2 -s ours am: 38ef30bc81 -s ours am: 5fac8299e1 -s ours Change-Id: I893889cfb4bf3dc924d1007d3470d11c3227fcba