YQ-DemoGit / base / dd137a85d3e - Bitbucket

Skip to sidebar navigation
Skip to content

Commits

0c5c18a2be1 + 6be2f952022

Svetoslav authored dd137a85d3eM11 四月 2014

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

Showing diff to6be2f952022