Bug 471247 - Import (de)resolve is FILE-based in room + diagram

Change-Id: Ie845584fce37f1880a2dd9c6fa48a74af2f7df11
11 files changed