commit | 71caaa9f9d65e707a74188b0a6db8f05a75112c6 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Mon May 23 16:05:51 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 23 16:05:52 2016 +0000 |
tree | f18b4f23760535840cf3c0410eb17d186883dd01 | |
parent | 720c041b1a233e7b5e775056b92144494bd9000c [diff] | |
parent | 8c14e3ad910939c0cf36796d86a9729dd132e956 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours am: 1a49e73d2a -s ours" into nyc-mr1-dev-plus-aosp