OSDN Git Service

Merge "Add assisted dialing properties to the framework." am: f5bec0d781 am: 1d9fc9a490
authorEric Erfanian <erfanian@google.com>
Wed, 13 Dec 2017 02:42:27 +0000 (02:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Dec 2017 02:42:27 +0000 (02:42 +0000)
commit777f745bfe85b001065821c0c4fec4bd0c3b24f5
treea1634616a3c48a300a14ae4a74199d0e84bf1fc4
parent643c76c63e3359f04f39aa4087865b3d2c7995b5
parentc73edfa2c6d8cfbcddb8e62a82799b5c388bd806
Merge "Add assisted dialing properties to the framework." am: f5bec0d781 am: 1d9fc9a490
am: c73edfa2c6  -s ours

Change-Id: I96c354bc5895fe62eafcf1732593910d7aa9c70d