am 6428c625: am 7d196768: am 927d8be7: Merge "Fix build error when XLOG is enabled"

* commit '6428c625e8012cbb7a367e900d2a9c31439c6ebf':
  Fix build error when XLOG is enabled
This commit is contained in:
Elliott Hughes 2015-01-21 02:25:38 +00:00 committed by Android Git Automerger
commit 0514b6be04

Diff Content Not Available