Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd07d616 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly." 

* commit 'fbe1cc92':
  Don't include <linux/socket.h> directly.
parents ed757e97 fbe1cc92

media/common_time/ICommonClock.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,8 @@ 
 * See the License for the specific language governing permissions and

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * limitations under the License.

 */

 */

#include <linux/socket.h>



#include <sys/socket.h>





#include <common_time/ICommonClock.h>

#include <common_time/ICommonClock.h>

#include <binder/Parcel.h>

#include <binder/Parcel.h>

media/common_time/ICommonTimeConfig.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,8 @@ 
 * See the License for the specific language governing permissions and

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * limitations under the License.

 */

 */

#include <linux/socket.h>



#include <sys/socket.h>





#include <common_time/ICommonTimeConfig.h>

#include <common_time/ICommonTimeConfig.h>

#include <binder/Parcel.h>

#include <binder/Parcel.h>