tree f58a48d0bb8224f06b30d8091b100e6a74f3c781
parent 66ce8af13a5ab59f38c0741c82ac146816c0a8b9
parent 8641d7215feff3e71b18c11ca8ec7722357fde8e
author Wink Saville <wink@google.com> 1359003150 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359003150 -0800

am 8641d721: am 6b35f44d: Merge "data: enhanced Telephony Carrier DB transaction time"

# By jewon.lee
# Via Android Git Automerger (1) and others
* commit '8641d7215feff3e71b18c11ca8ec7722357fde8e':
  data: enhanced Telephony Carrier DB transaction time