tree 94b392a9db73bd4ded3ee51ee9589faa77f7c307
parent e2b66ff085a03ab5cc02d4282c4e9e300003754d
parent 3fbf896c1f194c37bb49d753d7f30367a9a9c43f
author The Android Open Source Project <initial-contribution@android.com> 1370540339 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370540339 -0700

am 3fbf896c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit '3fbf896c1f194c37bb49d753d7f30367a9a9c43f':
  Maybe fix issue #9296868: Crash in system process
  Fix regression in long-press home behavior on tablets.
  Import translations. DO NOT MERGE
  Create missing Uids when recording network stats.
  Import translations. DO NOT MERGE