tree 8c19769f4612ed52006ad6d24c5dc5f88aca59b9
parent a50afa5ebfb60506b31f42fc4e04604845016343
parent 15b95580188b9d36b7f2b6891290c6100eb938ce
author Calin Juravle <calin@google.com> 1525912662 -0700
committer android-build-merger <android-build-merger@google.com> 1525912662 -0700

Merge "Properly prepare system server profiles"
am: 15b9558018

Change-Id: I83070dd881f164e8d458925274b2fb41851b1ae5