summaryrefslogtreecommitdiff
path: root/libs/rs/java
diff options
context:
space:
mode:
author The Android Open Source Project <initial-contribution@android.com> 2009-06-04 19:01:38 -0700
committer The Android Open Source Project <initial-contribution@android.com> 2009-06-04 19:01:38 -0700
commitcc8bce50db7ea530efa0db1ef05e2042b65b2f4b (patch)
tree055ff4166bce09c1d0e12d2001c5f2de76effaaf /libs/rs/java
parent13755dd9343277257e9162e5ca0263d0d56c8fad (diff)
parent1c54cf0903cd81467ca41ec6733c459e10b22763 (diff)
Empty merge, thru 1c54cf0903, which are already in master
Merge commit '1c54cf0903cd81467ca41ec6733c459e10b22763'
Diffstat (limited to 'libs/rs/java')
0 files changed, 0 insertions, 0 deletions