commit | 721e972633746a1a25e900ee6cad0c7f110e6a2a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 17 04:49:39 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 04:49:39 2016 +0000 |
tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
parent | 66299ffce0532be5ede58628405c470b28d044b8 [diff] | |
parent | 2ebc49de879f6cf46e1523321000e1c5d9fdc32b [diff] |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master am: 2ebc49de87 -s ours Change-Id: I56a11d5e529d87205c1be5a18bd6af78e695ab6a