Skip to content
Commit 95579cbb 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: cf1720a6 -s ours
am: 8d0be768 -s ours
am skip reason: subject contains skip directive

Change-Id: I27726ee2b43fc817465ebd148bbc5519cfa64298
parents 7d867c29 8d0be768
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