tree b379012ff169589f079a15e6bb6691d6743f1980
parent f0b8dacf1516e0d901c71109c906dc15ef855fc5
parent f0716b7a7475fc80a97fd6f95efecab570d186fb
author Winson Chung <winsonc@google.com> 1384891339 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1384891339 +0000

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