tree be3d7456a3f733a524d96f3084e07064dbddd775
parent 9f9eca732979408665d1be1e00468709b798fed8
parent fc075c19aae776d044d235665a0b327271115d04
author Hugo Arès <hugo.ares@ericsson.com> 1528739062 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1528739110 -0400

Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Change copyright to AOSP

Change-Id: I26c16e7a912d9e7edecfe2fa501315d07a9ca88b