tree 10da860fcff71886af91d082e31f0e1917926848
parent 0931c799d9a5060970d8191eb532334f771be556
parent 56879a3dbbcac39cab2d823afd67abe67ec1f49d
author Winson Chung <winsonc@google.com> 1414566369 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566369 +0000

am 56879a3d: 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 '56879a3dbbcac39cab2d823afd67abe67ec1f49d':