tree b21c66d5fbd096ac79e14aa7dc1ec32cae319c34
parent 0cd9c621a29beaa73b5efcfeb1512f1b6b33d5db
parent f9e077a531c6a83e978d55f427b5d8ff6d2c943f
author Jason Sams <jsams@google.com> 1363896481 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1363896481 +0000

Merge "Fix logging defined in external header." into jb-mr2-dev