commit | 96cf13a10bd067e9e29df993737bc193fc17737a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 30 21:52:41 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:52:41 2016 +0000 |
tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
parent | 18a71ddd2a8d22c47f9b63f82a2108fb78e1650d [diff] | |
parent | a461b81a5496b86cc09f71a95c13421907fafe2d [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 80eee73afb -s ours am: a461b81a54 -s ours Change-Id: I42c756fa6a969bae7570dfbdf2378c8ac9ea23db