tree b944855674729e34b2112657d9283c21a9517b57
parent b6535891c56d82fd65596575cd99926bc0c7225a
parent 3ee935110e31d2fc98ebd9f2ee1c661f8de35a66
author Hugo Arès <hugo.ares@ericsson.com> 1528738668 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1528738668 -0400

Merge branch 'stable-2.12' into stable-2.13

* stable-2.12:
  Change copyright to AOSP

Change-Id: I4a7eb3007befa0c83537f6d24529f3f416a25acf