tree 9c4223c2fdb43003c13b411131b7ab1b27bac554
parent 9e3cb55b8f6f007906872decfe3b8a2541e94dd2
parent f0f2841d95a26247dfa0b31a6bfa8b010fe89aa2
author Tim Murray <timmurray@google.com> 1369427776 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1369427776 +0000

Merge "Add RenderScript category for atrace."