tree ea3c0c78af51cfd0c99e7d1818390dd6e2fada7b
parent 75f1562fae52d1a94657baf392ca05f6dc1c8708
parent 1f85f505d55240e2e47d85d9b3a0e01407e1d2a5
author Jason Sams <rjsams@android.com> 1297206410 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297206410 -0800

am e2b2a02a: am 4fd70373: Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb

* commit 'e2b2a02a91dc4101a9481b5bb6ba4c56c7a35dd7':
  Fix bug 3421901 remove 2 functions from public headers in the SDK.