tree 7a238da4c126ede9b30dfa0727630c4c15a5d745
parent fc24e1c5afca4ef6add3f2f0386675a6481454e9
parent 5e7b01c8236b51fb9e413594afdec176cea89281
author Lorenzo Colitti <lorenzo@google.com> 1499859681 +0900
committer Lorenzo Colitti <lorenzo@google.com> 1499859721 +0900

resolve merge conflicts of 5e7b01c8236b to oc-dr1-dev-plus-aosp

Test: make -j64 framework services
Change-Id: I00460c8fe606fdce1f121685919d9a2e54febe5a