commit | 5fac8299e15c914589c7b6ee472c8aa71aa61d35 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 30 21:52:43 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:52:43 2016 +0000 |
tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
parent | 96cf13a10bd067e9e29df993737bc193fc17737a [diff] | |
parent | 38ef30bc8138d91fb6f9bbe68b997a259ce0ad09 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: f7fe0be6a2 -s ours am: 38ef30bc81 -s ours Change-Id: Ia094cfde386dc269efc050cd41b143ef69ea3667