tree 16fa67f270d46a40e4d1229cae7c0a7d45cdec19
parent 358feafb2e8e9ccb92d18820c3291cc025e87590
parent 7d4a8beb3648d96dcad93d06978a818bd75d4e72
author Hugo Arès <hugo.ares@ericsson.com> 1528738609 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1528738609 -0400

Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Change copyright to AOSP
  Build with API version 2.11.7

Change-Id: I2e93a8814059332f5348096565ebb2cf47860bdf