Geremy Condra cd7f13475c Merge commit 'c31f5a7e' into manualmerge ...

Conflicts:
	services/java/com/android/server/updatable/ConfigUpdateInstallReceiver.java

Change-Id: I40453434c04b2f41788b70e1d91f1777a8f7b120

2012-09-17 16:23:57 -07:00

..

com/android/server

Merge commit 'c31f5a7e' into manualmerge

2012-09-17 16:23:57 -07:00

Android.mk

…