tree 1cece953a02ca5ca7c55cd931de8935c199a7db8
parent 32f0816452a3d678aed7091aa4d9b7941303796c
parent 3e434947debe3aae3eb1e0f8efb0c0e819e2a4a5
author Android Build Merger (Role) <android-build-merger@google.com> 1501211069 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501211069 +0000

Merge "Merge "wifi: Modify the SAR power levels interface" into oc-dr1-dev am: 633fffbc0c am: deb4766df1" into oc-mr1-dev-plus-aosp