Skip to content
Commit 42c4bff7 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE" into... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4d5286bc  -s ours
am: a9be2e6a  -s ours

Change-Id: I66052e160ab6c98b2e4f5f6a17a57e9ed47545ef
parents 81781e42 a9be2e6a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment