commit | 54f2d178f6f4c474822425cf41dde971879c3a14 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 17 00:04:07 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 00:04:07 2016 +0000 |
tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
parent | 982b7c6e75ae21936e6c0cedfc79932d1307221b [diff] | |
parent | c6a6ef7e386e8a5b22e573731e6ae8951af73ffc [diff] |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master am: c6a6ef7e38 -s ours Change-Id: I0217358393d1ac6888cb5ef130a2e20ec3861c8c