summaryrefslogtreecommitdiffstats
path: root/services/java
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2013-09-12 16:44:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-12 16:44:24 -0700
commitebcb9ecf2b534c1a27b72c66bad05903e9e9b233 (patch)
tree32451696589d88479cdb124d09e367394d7dbad7 /services/java
parentf1690b1fe836ac81619c718749ea50f24e6253a7 (diff)
parent9501a452af30dd15559804193c8183bbaa42a669 (diff)
downloadframeworks_base-ebcb9ecf2b534c1a27b72c66bad05903e9e9b233.zip
frameworks_base-ebcb9ecf2b534c1a27b72c66bad05903e9e9b233.tar.gz
frameworks_base-ebcb9ecf2b534c1a27b72c66bad05903e9e9b233.tar.bz2
am 9501a452: am e850c973: Merge "Hide translucent activity conversion API" into klp-dev
* commit '9501a452af30dd15559804193c8183bbaa42a669': Hide translucent activity conversion API
Diffstat (limited to 'services/java')
0 files changed, 0 insertions, 0 deletions