OSDN Git Service

Merge changes I6badcc6a,I652ac746
authorDavid 'Digit' Turner <digit@google.com>
Fri, 17 Jun 2016 07:55:54 +0000 (07:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 07:55:54 +0000 (07:55 +0000)
am: dfc610e672

Change-Id: I394f0487feb127dbba501197b53d7ac7b6befb42

1  2 
init.goldfish.rc

Simple merge