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