commit | 30c8f7cf7af84eb86fdd051b5926f70a12e1d405 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 30 21:57:46 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:57:46 2016 +0000 |
tree | 94b0baa2df3b1ae37225948a0f746b04d9e96838 | |
parent | 7d5500a5eb0b43f53744c07724988612e389e953 [diff] | |
parent | 18a71ddd2a8d22c47f9b63f82a2108fb78e1650d [diff] |
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: b10be9d131 -s ours am: a9bfdd4dd2 -s ours am: 18a71ddd2a -s ours Change-Id: Ic38ac5a9c94b8efb2ea24514a9637b18b81f83e1