tree a17f8ab12a49f76471115c40010235d8d84fd73f
parent 0217ac8da7aa15f63086e2c6e648ae07eec089b4
parent 45ad2b07c30ed48b94d11c362105909348164f09
author Winson Chung <winsonc@google.com> 1392411715 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411715 +0000

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

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