OSDN Git Service

resolve merge conflicts of d676080a37 to lmp-mr1-ub-dev.
authorChristopher Ferris <cferris@google.com>
Wed, 21 Oct 2015 21:56:52 +0000 (14:56 -0700)
committerChristopher Ferris <cferris@google.com>
Wed, 21 Oct 2015 21:56:52 +0000 (14:56 -0700)
commitafff4442ae092469f298a71862d61c65ceb67b03
tree6b51a9b7e2c72f91e5a8e9fea42c264c79229cde
parent98384649b2d3f3eb5b03077bc0004e14a99a4d55
parentd676080a3752873249c1204b52e872fe48169276
resolve merge conflicts of d676080a37 to lmp-mr1-ub-dev.

Change-Id: I56c1bb2adb4b6a48733c928415e788e689b4944e
libc/Android.mk
libc/upstream-netbsd/android/include/netbsd-compat.h