tree a17f8ab12a49f76471115c40010235d8d84fd73f
parent 737776b2749dc27e919c4324aa28efe3df8ea0ba
parent c0ed8edf296725dfbff8cc95d9cb4803f6301390
author Winson Chung <winsonc@google.com> 1392411240 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411240 +0000

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 'c0ed8edf296725dfbff8cc95d9cb4803f6301390':
  Update the database when converting the final screen. (Bug 11683562, Bug 11034205)