summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-07-29 17:40:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-25 21:16:23 +0000
commitf4bf67012b2109ead9a4cb9c4407563fc3671255 (patch)
treed2060dee6c3c755a70b25efbb068b5030add625b /libs
parent6fdac3357eb3cc0d7123535f3f2f95db8a17807d (diff)
parentb6417b8b9492d88ccfbb723decaece1bb9ff0f73 (diff)
downloadframeworks_base-f4bf67012b2109ead9a4cb9c4407563fc3671255.zip
frameworks_base-f4bf67012b2109ead9a4cb9c4407563fc3671255.tar.gz
frameworks_base-f4bf67012b2109ead9a4cb9c4407563fc3671255.tar.bz2
Merge "Don't double-cancel the active ripple" into lmp-dev
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions