tree 6ee056d1e067878c60d2c4461bf537d55f0b5839
parent 71db714437eba4da29ddb14d58e11da8134715de
parent a361503e3e68d1b26ce737547c4e1d53a03ec2d9
author leozwang <leozwang@google.com> 1406738692 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406738692 +0000

am a361503e: Merge "Consolidate adb trace macro defines into its own header file." into lmp-dev

* commit 'a361503e3e68d1b26ce737547c4e1d53a03ec2d9':
  Consolidate adb trace macro defines into its own header file.