tree 9ae008fc66cca5ee77bedffe93f7d6cd03f88308
parent 6948580a1ce2f76879ff428c2563dccfcce3d86f
parent 0250945759f7ac58aab912448d62dc108b1770c5
author Adam Cohen <adamcohen@google.com> 1417718629 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417718629 +0000

am 02509457: Avoid db exception on L and above

* commit '0250945759f7ac58aab912448d62dc108b1770c5':
  Avoid db exception on L and above