commit | 9b14186afe3da3f3a5f090df9cf585ac21c87e15 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 30 22:01:37 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 22:01:37 2016 +0000 |
tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
parent | 32b5920734fc23041b954e1f042e765d0a919c40 [diff] | |
parent | 8181498163f088f2dbd5fa093e6f6beb3445a848 [diff] |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master am: 8181498163 -s ours Change-Id: Ib6c69380847dd5bd89e62495c00abe78227d632d