tree 6d17de7d9bb5cd3a0253a921f649f92b1f1de1f8
parent 8aff5b11149c710f84a566c938ae41e28f98b782
parent 252abe92e7508f09d40936b874f550367f0ef394
author Hugo Arès <hugo.ares@ericsson.com> 1528737076 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1528737121 -0400

Merge branch 'stable-2.12' into stable-2.14

* stable-2.12:
  Change copyright to AOSP

Change-Id: I00c6885ee60769fd1cd530d0e86c10a390738906