tree 9e07e5638f679920efdda0e26cf570a54e426eb0
parent 4eadd33462ec2b3235f939383525b01ec136da6f
parent beab750e1de8bb3c88aa4c8dee9aef0d020fcd21
author Hugo Arès <hugo.ares@ericsson.com> 1474551550 +0200
committer Hugo Arès <hugo.ares@ericsson.com> 1474551550 +0200

Merge branch 'stable-2.13'

* stable-2.13:
  Build with API version 2.13
  Fix buck build, remove java_test.source_under_test

Change-Id: I6cb12c9f788a0590dd22198585a66c2b75f98daf