tree 49a8bcc39396bd60ceec62735c02c7a82eccbaf6
parent 811f2c0b98d6f8935123221648c96ff975688902
parent 8c82b35239fff3b85acc7b2a76fb9488b10fb773
author Elliott Hughes <enh@google.com> 1401312957 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1401312957 +0000

Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."