tree 2558dd06012c41dee1809dd192a7678962e5eec2
parent 1d179cb854adf0c521c401210b2bba696a520a18
parent 530f569857e53d8a3a7610c453a15202c677bcec
author Hugo Arès <hugo.ares@ericsson.com> 1528738184 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1528738184 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Change copyright to AOSP

Change-Id: I5c9ef67c3cbfdff54f84abb7332da174447ee07d