OSDN Git Service

(root) / android-x86 / frameworks-native.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 73c9215 03e80b4)
resolve merge conflicts of 03e80b462 to oc-dev-plus-aosp
authorSteven Moreland <smoreland@google.com>
Fri, 21 Apr 2017 00:42:43 +0000 (17:42 -0700)
committerSteven Moreland <smoreland@google.com>
Fri, 21 Apr 2017 00:42:43 +0000 (17:42 -0700)
commit40d89431dbad9c7f5820ddbe21dd8a532f58f0f5
tree5342449d037f3d4da2f9b8a62659a89350b10002tree | snapshot
parent73c92155627909196b0d32ccc3af6bd1074a434fcommit | diff
parent03e80b4624a5ccc3a3d4cc2e5390464868731381commit | diff
resolve merge conflicts of 03e80b462 to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I3f41140bf5f10e03667a9e36c29df0d3e90d7bb0
services/sensorservice/Android.bp diff1 | diff2 | blob | history
frameworks/native
About OSDN
Find Software
Develop Software
Help