Files
frameworks_base/core/java/android
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
..
2014-03-27 18:30:20 -07:00
2014-03-18 18:00:01 +00:00
2014-04-09 13:17:42 -07:00
2014-04-08 22:42:13 +00:00
2014-03-28 23:35:10 +00:00