tree 366a788e7b9130b34b48c7c99fe06d11595db69b
parent 6a1c4930a97123cb21271e1e7160bd317a302601
parent 4f6d728e6267dd8cc550e61415364cef91ff7b01
author Eric Erfanian <erfanian@google.com> 1512711272 +0000
committer android-build-merger <android-build-merger@google.com> 1512711272 +0000

Merge "Add assisted dialing properties to the framework." into oc-mr1-dev am: 5d04d92265
am: 4f6d728e62  -s ours

Change-Id: I0b6554dc99c45e754e4caded2ea1ccff2f75a6dc