OSDN Git Service

Merge "Fix profile merges in profman"
authorCalin Juravle <calin@google.com>
Wed, 29 Mar 2017 18:16:25 +0000 (18:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Mar 2017 18:16:25 +0000 (18:16 +0000)
am: 1e45a522ea

Change-Id: If488dd18668acecf4910d4503b7472fffc06776a


Trivial merge