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

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:... 

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e032b74  -s ours" into nyc-mr1-dev-plus-aosp
am: 90ac2096  -s ours

* commit '90ac2096':
  Import translations. DO NOT MERGE

Change-Id: If8e806fe46665e21fa24853dd4bd85c7c48aa0e0
parents f604fec4 90ac2096
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