tree 7e2dd4180f7ce467c8ed5d1e54cb4d93ee22c9a6
parent 8019f49d0824b3027fcd8fa69d1bc9da64650d6f
parent 599c81d0eacdc679b4b25c47ba4b152816794a92
author Baligh Uddin <baligh@google.com> 1446752959 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1446752959 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master