tree c7ff7828d5e23794bb83c8be0e82c1129ccf33df
parent 3d74c6632ed6ab23db0cde80bc8a61daecfd49ef
parent dc2e07493703b7f15c93ea5f383f9fa7fdcf20f1
author Brian Carlstrom <bdc@google.com> 1422905458 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422905458 +0000

am dc2e0749: (-s ours) Move from host-libprotobuf-java-2.3.0-nano to current version

* commit 'dc2e07493703b7f15c93ea5f383f9fa7fdcf20f1':
  Move from host-libprotobuf-java-2.3.0-nano to current version