tree f73d95b2a6eb8c27033fb91af8522afed3a43012
parent 3d5884a63440f9560848cce34f83748092f85528
parent bd282dedee993c8b70da383e0ed86b356f6781e7
author Hugo Arès <hugo.ares@ericsson.com> 1528736987 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1528736987 -0400

Merge branch 'stable-2.12' into stable-2.13

* stable-2.12:
  Change copyright to AOSP

Change-Id: I990bcf6572434333d5bfc1428c921ca51fd41f66