diff options
| author | Kenny Root <kroot@google.com> | 2014-04-30 16:38:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-30 16:38:00 +0000 |
| commit | 2a148188109f80e0e5bb872c38d10352ee70cbd6 (patch) | |
| tree | 845c57a1204e13272ac318dc6458736c425b7597 /core/java/android/app/ActivityManager.java | |
| parent | 3338cb4481fa916ef2291b6ecc041b4f9df1edf5 (diff) | |
| parent | b3aa8f48044db8fdb15e8dd2dc0fc10c85f25375 (diff) | |
| download | frameworks_base-2a148188109f80e0e5bb872c38d10352ee70cbd6.zip frameworks_base-2a148188109f80e0e5bb872c38d10352ee70cbd6.tar.gz frameworks_base-2a148188109f80e0e5bb872c38d10352ee70cbd6.tar.bz2 | |
am c738d55c: resolved conflicts for merge of 3e320a0c to master
* commit 'c738d55cd082fe35c1d6d3e2c67b4187c4c4c94e':
Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
Diffstat (limited to 'core/java/android/app/ActivityManager.java')
0 files changed, 0 insertions, 0 deletions