commit | 7085bb345d04e9e1c221accb42f0d38943184b4f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 16 22:07:44 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 16 22:07:44 2016 +0000 |
tree | 875f483b1a8f05d9192c101f5b633389a536bebb | |
parent | 89132e094f23d7086d4a36fc58ac469a1ebb59f3 [diff] | |
parent | ecfe1a5e176721e8982882ed969aebb493db27ea [diff] |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master am: ecfe1a5e17 -s ours Change-Id: Icbdc4c2b98737adce95437613b0d0fc846a5a7e9