OSDN Git Service

resolved conflicts for merge of 90b39aba to master-lockscreen-dev
authorColin Cross <ccross@android.com>
Fri, 11 Apr 2014 05:41:05 +0000 (22:41 -0700)
committerColin Cross <ccross@android.com>
Fri, 11 Apr 2014 05:41:05 +0000 (22:41 -0700)
commitd4d46587665ede9cdd26d12d37368a35232a31e1
treeddb0421962d0e2fd3500ea9d57a31f9b32aac23d
parent923914bc5b4f48e2524d106527adacc5502ac2b9
parent90b39abaf95640021d15be70b5841abe8366b33e
resolved conflicts for merge of 90b39aba to master-lockscreen-dev

Change-Id: I2871a1e49c3b443cc7479f2352c652be3b0fb85b
tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java