tree 01e6b890c0f17e69fec7510d2856736b72e335e0
parent c0809125914256df4cbb1414348fed7699f6a53d
parent 1c96028f414f904b90c1a180a537021a6a3eceff
author Winson Chung <winsonc@google.com> 1417480551 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417480551 +0000

am 1c96028f: Merge "Ignoring specific db exception to workaround Bug. 18554839." into ub-now-queens

* commit '1c96028f414f904b90c1a180a537021a6a3eceff':
  Ignoring specific db exception to workaround Bug. 18554839.