tree 18d93d73b6b06f1977111c8c405307774cf3d65a
parent f4f7b2234eb5fabb460aa83d85ac57182ec473a3
parent d63c58d7d10876fccdde64ae61c801d7a684377a
author TreeHugger Robot <treehugger-gerrit@google.com> 1631307318 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1631307318 +0000

Merge "Allow restore between TYPE_PHONE AND TYPE_MULTI_DISPLAY in RestoreDbTask" into sc-v2-dev