tree d18b96192e6fe6d01158ad0e7cf8962982676eef
parent bc0b98bde5cea81a233d622b925013cded2b8495
parent a64d1f9a0851d263b8dc8a76117087780c8162c3
author Edwin Kempin <ekempin@google.com> 1472559911 +0200
committer Edwin Kempin <ekempin@google.com> 1472559931 +0200

Merge 'stable-2.12'

* stable-2.12:
  Build with API version 2.12.4

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