commit | 39902f96d018209a64b73157e2b50ad201fde656 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Mar 23 12:46:26 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Mar 23 12:46:26 2016 +0000 |
tree | fab58a6b3f7e1f85569b6c74ee9eba696850b21e | |
parent | 099a75b9ecfc1da2dcf077471ca64e57659990ee [diff] | |
parent | 39e383a171e4bc949131fef9a9893874ff4cc5c7 [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5ee8a49 -s ours am: 39e383a -s ours * commit '39e383a171e4bc949131fef9a9893874ff4cc5c7': Import translations. DO NOT MERGE