commit | 6d68c0d894365ccf1daed18b138d7bfd987ff309 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Aug 04 09:34:32 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 04 09:34:32 2016 +0000 |
tree | a196393af263f947f6a28685a1b7c35699367107 | |
parent | 46df39aa6ec7e246661a8d9c7acf34bc9c4b782a [diff] | |
parent | 968e1d93f828e6f2ed12713f84e5eac7b46fc3e4 [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 85c61142ab -s ours am: 968e1d93f8 -s ours Change-Id: I904eedd10519adbeababb8aff682d086dfa0f6b0