summaryrefslogtreecommitdiffstats
path: root/rs/java/android/renderscript/Int2.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-07-23 21:55:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-23 21:55:50 +0000
commit815382c8b6b56501df5da0dfea1db997f431db72 (patch)
tree2862151a3cb398bb0d8a61206822e63526f7a996 /rs/java/android/renderscript/Int2.java
parent7c469f1aec075798610d45875016f6eacd7933c6 (diff)
parent357d2eef0171c627ed20eca9de860b090671e8df (diff)
downloadframeworks_base-815382c8b6b56501df5da0dfea1db997f431db72.zip
frameworks_base-815382c8b6b56501df5da0dfea1db997f431db72.tar.gz
frameworks_base-815382c8b6b56501df5da0dfea1db997f431db72.tar.bz2
am 014089cd: am 82b83fb5: Merge "Use activity for brightness dialog" into lmp-dev
* commit '014089cd92401236b160c0f3384b430c1f610e34': Use activity for brightness dialog
Diffstat (limited to 'rs/java/android/renderscript/Int2.java')
0 files changed, 0 insertions, 0 deletions