OSDN Git Service

Merge "atrace: Don't NPE if we can't access hal-related tracepoint files." into oc-dev
authorCarmen Jackson <carmenjackson@google.com>
Wed, 19 Apr 2017 01:10:50 +0000 (01:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Apr 2017 01:10:50 +0000 (01:10 +0000)
am: 638fc1f809

Change-Id: I5c6fa1f459c84c45d00f1047aee09fdf921cf345

1  2 
cmds/atrace/atrace.cpp

Simple merge