summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2012-09-28 12:21:10 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-28 12:21:28 -0700
commit808ce66a08bbd2604d71f3368788ba7496f71482 (patch)
treebc288245c57edd551a02b3d7bc81a38da1ad10d4 /media/java
parentcfb7d392ef9d4cf0ed7d846da93225f0512e882b (diff)
parentf3a2bf8edd2e070a24f0d7c105d78b38576e14ac (diff)
downloadframeworks_base-808ce66a08bbd2604d71f3368788ba7496f71482.zip
frameworks_base-808ce66a08bbd2604d71f3368788ba7496f71482.tar.gz
frameworks_base-808ce66a08bbd2604d71f3368788ba7496f71482.tar.bz2
Merge "ScaleGestureDetector does the safety dance." into jb-mr1-dev
Diffstat (limited to 'media/java')
0 files changed, 0 insertions, 0 deletions