OSDN Git Service

Merge "base: Convert libs/services/Android.mk into a blueprint" am: f0561142f3 am...
authorSami Kyostila <skyostil@google.com>
Fri, 12 Jan 2018 15:03:22 +0000 (15:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 15:03:22 +0000 (15:03 +0000)
commit200cd63fb3ff5b4354773e9994f4340f18b39cbc
tree5dd33ec1a6126258dacc82e3126eeeb2cb4ec6b9
parent2884b9f749601219c5b6ab83266c6e9182e3cb9e
parent094488916426bc74a8d567ec19bece037a3afbf3
Merge "base: Convert libs/services/Android.mk into a blueprint" am: f0561142f3 am: 8f919b8c5b
am: 0944889164  -s ours

Change-Id: I1dc35e30d0eb333a96a0e6b045ec7ebe43fb9a5b