From: Bjoern Johansson <bjoernj@google.com>
Date: Fri, 27 May 2016 21:24:49 +0000 (+0000)
Subject: Merge "Remove Dev Settings app from emulator images" into nyc-dev am: 4f2f58791f
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=592c12f1ac6a31edb5a095b77fd531d8869d8dc1;p=android-x86%2Fbuild.git

Merge "Remove Dev Settings app from emulator images" into nyc-dev am: 4f2f58791f
am: d3559f1505

* commit 'd3559f150580d8a8e435a85a362e85369c31df74':

Change-Id: I757cb5fe9ace28482f7473af32d0153ea9cbc682
---

592c12f1ac6a31edb5a095b77fd531d8869d8dc1