commit | bc1848662b5f3d2a24017f3f79d00fba52a2d031 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Mon May 23 16:08:10 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 23 16:08:11 2016 +0000 |
tree | f18b4f23760535840cf3c0410eb17d186883dd01 | |
parent | fa764c3fa3959ca94766b0a7ed406aab410f772a [diff] | |
parent | c1de9659e4d823ad707c72cd3131d2e0a4e7f398 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours am: 0b9b896202 -s ours" into nyc-mr1-dev-plus-aosp