OSDN Git Service

Merge "Add javadoc to explain ApnSetting conflict." into pi-dev am: 3cc7c4fc76
authorYueming Wang <yuemingw@google.com>
Tue, 27 Mar 2018 10:45:58 +0000 (10:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Mar 2018 10:45:58 +0000 (10:45 +0000)
commita91c4ac73cb74f35bc9316c1889201dc9c43fb1f
tree85079f48f568a9d9c1be8d3acf91bfb66d53b863
parentd6382ed1a15fa13824e0a6b7e104292f64fae95f
parent5148a2e55f044763a04e4eddc18054632aba53fd
Merge "Add javadoc to explain ApnSetting conflict." into pi-dev am: 3cc7c4fc76
am: 5148a2e55f

Change-Id: I98a93f4f9dad2f50c18b5a14c3500d8598368a33