summaryrefslogtreecommitdiffstats
path: root/obex
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@android.com>2014-04-30 00:03:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-30 00:03:29 +0000
commit9feab5f278d8c9e030e72989a7f6f3d2f376748d (patch)
tree320863f66419cc142f3e3fb0cd3577731d9b8d6a /obex
parent293513a59d36cd96a3e474dde5981380d372d8c9 (diff)
parent8a02b20f6f3fdd5baa5d22321769303ce76ba80a (diff)
downloadframeworks_base-9feab5f278d8c9e030e72989a7f6f3d2f376748d.zip
frameworks_base-9feab5f278d8c9e030e72989a7f6f3d2f376748d.tar.gz
frameworks_base-9feab5f278d8c9e030e72989a7f6f3d2f376748d.tar.bz2
am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
* commit '8a02b20f6f3fdd5baa5d22321769303ce76ba80a': Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
Diffstat (limited to 'obex')
0 files changed, 0 insertions, 0 deletions