Skip to content
Commit 74b8c53d 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: f82c8527 -s ours
am: 4411ca05 -s ours
am skip reason: subject contains skip directive

Change-Id: I4cb68d51b0dd9dffff66cd851a0d2f48eb1b304d
parents e6568741 4411ca05
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