Svetoslav dd137a85d3 resolved conflicts for merge of 6be2f952 to master-lockscreen-dev ...

Conflicts:
	core/java/android/view/IWindowManager.aidl
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: Idcbc581294cc52b53eabefd61e5c20cbcea611db

2014-04-10 12:48:07 -07:00

..

java/com/android/server/accessibility

resolved conflicts for merge of 6be2f952 to master-lockscreen-dev

2014-04-10 12:48:07 -07:00

Android.mk

Check feature bits before loading optional services

2014-02-05 19:26:40 +00:00