tree 599b21ab93131c5c85d3fdada3e4a7bb852e2421
parent e271462f845e46f7e38e020f03e7fd7988c72bfb
parent 2d107a4cac933d01e6fa0cd5bb39fcbefa0705f2
author Hugo Arès <hugo.ares@ericsson.com> 1528736553 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1528736603 -0400

Merge branch 'stable-2.11' into stable-2.12

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

Change-Id: Iba3eea3738b1369f5659c9632b240b207015e214