Merge changes from topic 'adb_trace'

am: 8e7c782eaa

Change-Id: I1545be5ffc0dedbeadf9efc3f275262bd3e8bfbc
This commit is contained in:
Josh Gao 2016-12-13 00:42:11 +00:00 committed by android-build-merger
commit 2f78a3f6a5

Diff content is not available