tree 58a69e839a81c73bc217e045b615dc43bef000d9
parent d3701d422329791f6758649249e6db3e538a0c4e
parent 2e06b6dac2f88307e7e3a3e25031949f14a9fc51
author Winson Chung <winsonc@google.com> 1392410284 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410284 +0000

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

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