tree a6b1aba642fc7e6f7ccb4ce493ecce8e403c3845
parent 49b73d04eaecbaa248c193433c409be57900241b
parent 0ab164a802503f5f96b3ce8303835b20eed715fb
author Geoff Mendal <mendal@google.com> 1433865651 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433865651 +0000

am 0ab164a8: (-s ours) am a61fa721: (-s ours) Revert "Import translations. DO NOT MERGE"

* commit '0ab164a802503f5f96b3ce8303835b20eed715fb':
  Revert "Import translations. DO NOT MERGE"