Adds testing framework to com.android.ims am: 3eb99bdaaa am: d4af2331b8
Brad Ebinger [Thu, 22 Dec 2016 00:45:55 +0000 (00:45 +0000)]
am: f2818debe7

Change-Id: I9c264ff259046f0b041eaad9619b13dd12402fc5


Trivial merge