commit | 5cc2c12f29e0d186da4449b8ef0c7569d01af1b7 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Fri May 27 03:03:01 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 27 03:03:03 2016 +0000 |
tree | 3a00a881989b0e2a5405be2e6ddc66106a0e77a4 | |
parent | 88a41ca185856a5393fee54f321742a4aeeb584b [diff] | |
parent | 56dd24fdd252ea9b1984dc6591a70e11ecdf07b5 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0 -s ours am: 02befc3229 -s ours" into nyc-mr1-dev-plus-aosp