OSDN Git Service

(root) / android-x86 / system-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9209d6b 4897bb5)
resolve merge conflicts of 4897bb5 to nyc-mr2-dev-plus-aosp
authorTom Cherry <tomcherry@google.com>
Tue, 25 Oct 2016 05:15:12 +0000 (22:15 -0700)
committerTom Cherry <tomcherry@google.com>
Tue, 25 Oct 2016 05:15:12 +0000 (22:15 -0700)
Change-Id: Iacad26a1b27d032e7abd1c7c23a8ee87d61d0aa4

1  2 
healthd/Android.mk patch | diff1 | diff2 | blob | history

diff --cc healthd/Android.mk
Simple merge
system/core
About OSDN
Find Software
Develop Software
Help