ref: f937114402d199aee7d8eea9710661152908c385
parent: 7155f7ab782854363970d75b0131b84ead1daa6b
parent: cbecf57f3e0d85a7b7f97f3ab7c507f6fe640a93
author: Johann <johannkoenig@google.com>
date: Mon Nov 9 12:00:37 EST 2015
Merge branch 'javanwhistlingduck' Change-Id: Ib63fde31ae7b3f71e608830f7433113733b2a275