tree 50d3b1424e4805f9842b186924846a238de54150
parent 91d30b76779a7911e4252a68c0b70a154b3295c5
parent 6dc8f7c856f51223213c4106ebe9320f15f01013
author Winson Chung <winsonc@google.com> 1384891516 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384891516 -0800

am 6dc8f7c8: Merge "Update the database when converting the final screen. (Bug 11683562, Bug 11034205)" into jb-ub-now-jolly-elf

* commit '6dc8f7c856f51223213c4106ebe9320f15f01013':
  Update the database when converting the final screen. (Bug 11683562, Bug 11034205)