| commit | bd398d6c27c47b8b6c7278e75aadc932cb26f17c | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 03 18:51:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 03 18:51:52 2016 +0000 |
| tree | db123fc3f028d65464b0d1fdbf59207786dc3aa0 | |
| parent | f604fec47fa5296ecc88b6f87cd78b63e47f20c6 [diff] | |
| parent | 90ac2096fc0d00472f2d66600e98fdbf5799d1b0 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e032b7463 -s ours" into nyc-mr1-dev-plus-aosp am: 90ac2096fc -s ours * commit '90ac2096fc0d00472f2d66600e98fdbf5799d1b0': Import translations. DO NOT MERGE Change-Id: If8e806fe46665e21fa24853dd4bd85c7c48aa0e0