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

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 

am: 251a4aa0 -s ours
am skip reason: subject contains skip directive

Change-Id: I773bb8bc2ab1167200a41f6645b5ba4650fd4514
parents a33dc507 251a4aa0
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