tree 2ba7c96e36c3c4f11758347719fd5a879632b8ce
parent 947d019aafc883105e7643849749919963359fe2
parent 5651114c4282dfe748c093fd4946039c41037fac
author Edwin Kempin <ekempin@google.com> 1455781412 +0100
committer Edwin Kempin <ekempin@google.com> 1455781639 +0100

Merge branch 'stable-2.12'

* stable-2.12:
  Build with API version 2.11.7
  Build with plugin API 2.12 final release
  Fix retrieval of path from URL

Change-Id: I7644d8cfc0cf8333271225d7135218ec4a5fa02b
Signed-off-by: Edwin Kempin <ekempin@google.com>