tree 56c1cd2c45204f3f15896f4f313b25c8bf01d3c5
parent 6e0621794dc771abf417ec0f408c5b6e9b2830b1
parent 481c1570dc5cdf58265b53f657801709dd05d1df
author Jeff Brown <jeffbrown@google.com> 1331583927 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1331583927 -0700

Merge "Add Java wrappers for new atrace functionality."