commit | c5529eff0caea3a514c2cad6f35c2791a14bfc0a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jul 01 05:21:35 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 01 05:21:35 2016 +0000 |
tree | adafbe6ca9d526febd13c44178317188cbeec1ab | |
parent | c7e4e7965de879b3219e91a5344c640ccc0cdcc6 [diff] | |
parent | ffdd2f212449dfb55f39951ba1c9eda062159f47 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: af3c550fa2 -s ours am: ffdd2f2124 -s ours Change-Id: I3639f75eb19a4d641889eddf6bb428597c877a6c