Merge "Fix flag value collision" into nyc-dev

am: e5cebf7aaa

* commit 'e5cebf7aaa1a1eaa16bbb8b039a572e19e0a5542':
  Fix flag value collision

Change-Id: I3e37e772474b2a8d37d2bb4dcea41daa46e23c69
This commit is contained in:
John Reck
2016-04-21 23:30:10 +00:00
committed by android-build-merger

View File

@@ -1251,7 +1251,7 @@ public interface WindowManager extends ViewManager {
* the device supports it.
* @hide
*/
public static final int PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE = 0x00020000;
public static final int PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE = 0x00040000;
/**
* Control flags that are private to the platform.