tree 98bb77ff1a88140da19f9d81086c818e4c0ad0aa
parent feb6c7f3d6d52648009ffb6fffa1f76d2f68fd21
parent 111a81669edca651d5dc3481a58059c971a10ee2
author Geoff Mendal <mendal@google.com> 1418656236 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1418656239 +0000

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev