tree afb5d2e1b54e7c61f161a283d22f44db346a95b1
parent ecd42a5edcbbb5eef638c712878514a637969d62
parent 082874f376b99c635d71fbc28d7178e830bd66ab
author Edwin Kempin <ekempin@google.com> 1453276018 +0100
committer Edwin Kempin <ekempin@google.com> 1453276036 +0100

Merge branch 'stable-2.12'

* stable-2.12:
  Build with plugin API 2.12 final release

Change-Id: I0ab3818aa39e18ead7025de7baaacf0047ae5187