tree 8b24ddee703c280facf226a44719cabcf7ef085b
parent 04ff9583a02579e8cf89a636e3484853ca25a36d
parent c3d30c5adc13f8ef0dcbf9110272e4eb69be5f9c
author Hugo Arès <hugo.ares@ericsson.com> 1528738022 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1528738069 -0400

Merge branch 'stable-2.12' into stable-2.13

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

Change-Id: Ie648d90c75376b41f4da8ec5836cf5258dcb9849