tree e1d1758db21bc21f282378a335927ec863db8f85
parent b298217ed72e92a69eb6c2ba1cda8bf5dd0f1808
parent 28eac81d9107eea16543613ef01dcecbc6ac4570
author Hugo Arès <hugo.ares@ericsson.com> 1528738944 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1528738944 -0400

Merge branch 'stable-2.15'

* stable-2.15:
  Change copyright to AOSP

Change-Id: I19dfb3cc835a27fe4e1f95c5a5c530e13929f32c