summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/WindowId.java
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2014-10-16 19:10:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-16 19:10:59 +0000
commit97e21e85bd99542ebe7b9083958db516286b9b82 (patch)
tree66bb3539544c0075fb2d90841766c1b38737242c /core/java/android/view/WindowId.java
parent436d4df6433e444fa08ec8258f48187e67018dda (diff)
parentf8e428dd68279a662b310905798479f5fea85c0f (diff)
downloadframeworks_base-97e21e85bd99542ebe7b9083958db516286b9b82.zip
frameworks_base-97e21e85bd99542ebe7b9083958db516286b9b82.tar.gz
frameworks_base-97e21e85bd99542ebe7b9083958db516286b9b82.tar.bz2
am f8e428dd: am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev
* commit 'f8e428dd68279a662b310905798479f5fea85c0f': OpenGL 3.1 and AEP documentation for L-release.
Diffstat (limited to 'core/java/android/view/WindowId.java')
0 files changed, 0 insertions, 0 deletions