tree f8156fafa70fd5e96f27bec41e1f26da6c25c0ae
parent 706748782173d2f02fbbeda1310e09cd033157a3
parent 11caddafb09ebe9a290757bfcfd187a35e54c867
author Jeff Sharkey <jsharkey@google.com> 1458671990 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458671992 +0000

Merge "Update TrafficStats SystemApi docs." into nyc-dev