]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android/platform-hardware-interfaces.git/commitdiff
projects / android / platform-hardware-interfaces.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49abbfd 6ecc54a)
resolve merge conflicts of 6ecc54a7 to stage-aosp-master
authorsqian <shuoq@google.com>
Tue, 18 Jul 2017 20:42:40 +0000 (13:42 -0700)
committersqian <shuoq@google.com>
Tue, 18 Jul 2017 21:12:10 +0000 (14:12 -0700)
Test: I solemnly swear I tested this conflict resolution.

Change-Id: I369fe9aacf37dcea6225b5e5a658159dfb859ad0

1  2 
radio/1.0/vts/functional/radio_hidl_hal_misc.cpp patch | diff1 | diff2 | blob | history

Stable Android distribution for TI processors; Supported SoCs: Jacinto (DRA7xx, J721E), Sitara (AM43xx, AM57xx, AM65x) - fork of https://android.googlesource.com/platform/hardware/interfaces/.