commit | 424e13df65d80e4883a96298a46891ee2a8ecd80 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Wed May 04 01:40:36 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 04 01:40:37 2016 +0000 |
tree | 159a06111ab05547e2d50067378cd05278b862e6 | |
parent | e88320a9c709ac27a489c6aced70cb4be971d033 [diff] | |
parent | f8a514dfd6b714ec7c54ef2d3efc30284f908f15 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a -s ours am: 919ba24275 -s ours" into nyc-mr1-dev-plus-aosp