commit | 8ef6b75d1ec9d9c6e70f21ca1b7d5d24c13818f5 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Aug 26 20:46:07 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 26 20:46:11 2016 +0000 |
tree | a826b29cbce1b254f68273f89394c3166b3ab122 | |
parent | e3cd4b394c6334eb828e5bbc4d69de2896b76678 [diff] | |
parent | 8455068d793a4430475a3d9cdbbaf527c527d8b7 [diff] |
Merge changes from topic 'am-51f46b0037de4a44a6855ff5a0be6dfa' into nyc-mr1-dev-plus-aosp * changes: Merge "Add device config to determine when "allow hold" carrier config is used." into nyc-mr1-dev am: 020212c7df am: ffe4d64182 Add device config to determine when "allow hold" carrier config is used. am: d81c426e1d am: 6c619a2abb Merge "Implement new ephemeral resolver design" into nyc-mr1-dev am: 80855e154e am: 2265267555 Implement new ephemeral resolver design am: fea1b776e9 am: 6485f6eddf