| commit | 56879a3dbbcac39cab2d823afd67abe67ec1f49d | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Thu Oct 23 17:31:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:31:32 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 3734461fa74d27b5e7f3edcd5ae5033841f56679 [diff] | |
| parent | 45ad2b07c30ed48b94d11c362105909348164f09 [diff] |
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 '45ad2b07c30ed48b94d11c362105909348164f09':