From: Mark Salyzyn <salyzyn@google.com>
Date: Fri, 18 Sep 2015 21:17:05 +0000 (+0000)
Subject: Merge "Build Breakage in branch: git_master @ 2265859"
X-Git-Tag: android-x86-7.1-r1~133^2~52^2^2~16
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6b355fea;p=android-x86%2Fsystem-extras.git

Merge "Build Breakage in branch: git_master @ 2265859"
---

6b355feae3fe04847f9ea267649eca366b6cf85c