commit | eed665acfd9698b3622cf4c7355929b32e1fd15e | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Oct 20 17:03:11 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 20 17:03:11 2017 +0000 |
tree | b8b6458f71902ec8abef43b8370497a631aa5a2f | |
parent | 5993317cf84b26d7270d50eefe6b21b4c59040bd [diff] | |
parent | 33b0f435de3ca632a1a1dc0538d3931176a665bd [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f9cf2df461 -s ours am: 33b0f435de -s ours Change-Id: I9506048b61420c3bc9d353631b400200f5535e9a