Craig Mautner b12eb71c4f Merge commit 'bf581034' into manualmerge
Conflicts:
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: I9fd35ea9166ec73ce1f9f6154aa4ec87e79e20cb
2013-11-12 19:17:06 -08:00
..
2013-11-11 21:48:53 -08:00