tree eb2fc4cdd0cc5b9ec5be9d5377463bd84d045549
parent a4a9318c400c73cceecbb1ffe3b8ee3dab1b00f7
parent 3277cd7023e99dadf88c051d27e8aa26cc963838
author Ed Heyl <edheyl@google.com> 1381335152 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381335152 -0700

am 3277cd70: am c86f2e78: am c9d75a1e: merge in KQS81M

* commit '3277cd7023e99dadf88c051d27e8aa26cc963838':
  Don't wipe subclass helper's tables in our upgrade steps
  Fix Dialer crash due to missing database columns
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE