commit | 34134ee6b1c803ff49dbdde6a15458f3db359dee | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 30 21:57:53 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:57:53 2016 +0000 |
tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
parent | 8ae9bcbbd32ed2dfc463cfa5e2fac71f3f044d83 [diff] | |
parent | 32b5920734fc23041b954e1f042e765d0a919c40 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 64e0910859 -s ours am: 32b5920734 -s ours Change-Id: I737ae370dfd0baf9454f21bc035e5ba5effe3786