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)
am: 0944889164  -s ours

Change-Id: I1dc35e30d0eb333a96a0e6b045ec7ebe43fb9a5b


Trivial merge