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