tree c028bfe537607823c37e2ffc8c713c73059d3130
parent ce0117dc598f24e97b929df5567329e4816a777d
parent f9525ebcdefb40a003e872a3a6f3a48374699eeb
author Geoff Mendal <mendal@google.com> 1422685267 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685267 +0000

am f9525ebc: (-s ours) am 61677b41: (-s ours) am 1bcebeae: (-s ours) Import translations. DO NOT MERGE

* commit 'f9525ebcdefb40a003e872a3a6f3a48374699eeb':
  Import translations. DO NOT MERGE
  fix build
  fix build
  Remove dependencies on FloatMath
  Update protobuf library from 2.3 to 2.6.
  Import translations. DO NOT MERGE
  Fix overlapping pages (issue 12551580)
  Properly saving migration cling keys.
  Tightening migration conditions. (Bug 11973614)
  Import translations. DO NOT MERGE
  Fix build
  Import translations. DO NOT MERGE
  Initial empty repository
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  override Launcher2 (aosp)