| commit | 38ef30bc8138d91fb6f9bbe68b997a259ce0ad09 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Jun 30 21:48:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 21:48:55 2016 +0000 |
| tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
| parent | a461b81a5496b86cc09f71a95c13421907fafe2d [diff] | |
| parent | f7fe0be6a2808c1a3b4585f2e01d18cbbd7c1b67 [diff] |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master am: f7fe0be6a2 -s ours Change-Id: Iac6c9a980e0de2e0b4f3a9b10754a9e6a51c0dcb