OSDN Git Service

am 2e06b6da: am 6dc8f7c8: Merge "Update the database when converting the final screen...
authorWinson Chung <winsonc@google.com>
Fri, 14 Feb 2014 20:38:04 +0000 (20:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Feb 2014 20:38:04 +0000 (20:38 +0000)
commitc0ed8edf296725dfbff8cc95d9cb4803f6301390
tree58a69e839a81c73bc217e045b615dc43bef000d9
parentd3701d422329791f6758649249e6db3e538a0c4e
parent2e06b6dac2f88307e7e3a3e25031949f14a9fc51
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)