tree ac37bb068460424ba74cdde1b597a6d03feb3171
parent 42cc13614022b13d96950e4d4d4766969e527108
parent 12a645d708c865594a9a606ff6b15f66d79a5fee
author Hugo Arès <hugo.ares@ericsson.com> 1528738095 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1528738143 -0400

Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Change copyright to AOSP

Change-Id: Idb74d73ba469885dc3c90d1e21fc04f75ee83910