tree 4285ff4a44232ed5f302a6695dfb49a34be7da3d
parent 12ea8005665085ae82c1b233ae93d12855e04b8b
parent 987fc5a3c4046831dc9e6c252e99a9c694bbd9ee
author Elliott Hughes <enh@google.com> 1363392557 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363392557 -0700

am 987fc5a3: am adeec096: Merge "Hide various symbols that shouldn\'t be exposed."

* commit '987fc5a3c4046831dc9e6c252e99a9c694bbd9ee':
  Hide various symbols that shouldn't be exposed.