tree 7864c8885c699be79018866f8f3d8118ffd84ca4
parent a3373bd461d0335c85bcf3df0bcfe137d31b2fe9
parent f0561142f3b7ddd85947d7ee268d5b98a39489b9
author Sami Kyostila <skyostil@google.com> 1515766570 +0000
committer android-build-merger <android-build-merger@google.com> 1515766570 +0000

Merge "base: Convert libs/services/Android.mk into a blueprint"
am: f0561142f3

Change-Id: I4c707c676f03048b9130b140c25b3b9c58ec06ce