tree 5efb3bd9d10cc4cff82263f7b9c72f3a6803855a
parent c135a0d8a878b89ad447a683d2769b27d52c2748
parent d8bf81104d0d618c9b84dd7cea169c63375f6d5b
author Edwin Kempin <ekempin@google.com> 1444992898 +0200
committer Edwin Kempin <ekempin@google.com> 1444992898 +0200

Merge branch 'stable-2.11'

* Update API version to 2.11.4

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