tree ff40d7b64918017c2509040a71d2aa2ee7604ac9
parent 6bbf67c11ea1b7e8e9769113072c167e822fe73f
parent 165c687ec0f21b4ca003384a7528305e38d2f4c6
author Elliott Hughes <enh@google.com> 1362591308 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1362591308 +0000

Merge "fix build problem, when #define ENABLE_ANDROID_LOG 1"