tree 39f9ae4521596be576d7a7cb38bd71e88d3f364b
parent 6e4f9304579e1437e70b2b458142fa095a38f028
parent 18140a67842641bbef469665d1a540f7836f031f
author Brad Ebinger <breadley@google.com> 1485558816 +0000
committer android-build-merger <android-build-merger@google.com> 1485558816 +0000

Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549 am: b5f2519abc
am: 18140a6784

Change-Id: I1c29dcbdd4f1f1f97bf2e3eb3a1f0bdc83613676