tree 2daab3da22f84c167b635acccf7e0bcf5200d21f
parent b38939436199c65299809f6adb50db6d3b44f7b0
parent c3031c70f70432f423c0e6a1f6f75d74798a0901
author Dan Albert <danalbert@google.com> 1415734114 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1415734114 +0000

Merge "Use platform protobuf unless building with NDK."