commit | f3daae9a16925963a6c6a9884bff7be50501c1ae | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Nov 21 02:36:47 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 21 02:36:47 2016 +0000 |
tree | cce35e9b04e4971de4aa05635f9f69b39a8c4e41 | |
parent | e291f00d8af7bb44aa66fc3edd54edf32e9d8891 [diff] | |
parent | 059022bc1ba2f2bf2ba7f46d79f69444fcf81a78 [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: b9762351a3 -s ours am: 00544de5d0 -s ours am: 059022bc1b -s ours Change-Id: Ie0f0b1e584527475c30aff1b45f957789b0cac14