From: Bill Yi <byi@google.com>
Date: Tue, 6 Dec 2016 23:40:36 +0000 (+0000)
Subject: Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d6abb5769b814e41359eddf55d6fa88eaff89542;p=android-x86%2Fart.git

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 0dd27eb2b5

Change-Id: I073a492a7e0b7ce8ff4dd108da20e2d5e77cff98
---

d6abb5769b814e41359eddf55d6fa88eaff89542