OSDN Git Service

resolve merge conflicts of 083f4ec to nyc-dev-plus-aosp
authorArve Hjønnevåg <arve@android.com>
Fri, 19 Aug 2016 01:23:22 +0000 (18:23 -0700)
committerArve Hjønnevåg <arve@android.com>
Fri, 19 Aug 2016 01:23:22 +0000 (18:23 -0700)
commit504fd0a2e933628c223ec3e3db5a4ddce7ef71ea
tree786cf16d8659c801ac1faee183e2b01ab8b441ca
parentdef5b03a2e64628dca657789050a340b33a1796e
parent083f4ecca201e508f0f5cbe0aa95882a82abdf5e
resolve merge conflicts of 083f4ec to nyc-dev-plus-aosp

Change-Id: I1532b1e4ee225f821fcd6a9eaee11f20bac8c9e1
cmds/servicemanager/Android.bp