summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2012-10-16 19:01:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-16 19:01:35 -0700
commitaa2804aa2bf1a2c89af947501549361945ffac3f (patch)
tree8b978e439a6558d5eb34dd593b19d075e67eab42 /api
parent9dff9125074bfd1a4ead4ba995fd830b9a121263 (diff)
parente13ae648504661ca158d15aa415568e351b380c4 (diff)
downloadframeworks_base-aa2804aa2bf1a2c89af947501549361945ffac3f.zip
frameworks_base-aa2804aa2bf1a2c89af947501549361945ffac3f.tar.gz
frameworks_base-aa2804aa2bf1a2c89af947501549361945ffac3f.tar.bz2
am e13ae648: Merge "Use parent window to evaluate show-to-all-users." into jb-mr1-dev
* commit 'e13ae648504661ca158d15aa415568e351b380c4': Use parent window to evaluate show-to-all-users.
Diffstat (limited to 'api')
0 files changed, 0 insertions, 0 deletions