DESCRIPTION

Partially revert b991db9d4412be76a4e1f3f92a0701e1e1cb27cd.

The commit introduced some API breaking changes. The old classes can be
marked as deprecated and removed in the next major release.

Change-Id: I938f56dee99700fbb68e0f0a876c9ac72ef5bd46
Reviewed-on: https://git.eclipse.org/r/15744
Reviewed-by: Kaylin Maxwell <Chasity xxx@xxx.xxx
IP-Clean: Kaylin Maxwell <Chasity xxx@xxx.xxx
Tested-by: Kaylin Maxwell <Chasity xxx@xxx.xxx


COMMENTS

author: Gerrit Code Review
date: 2013-08-31 04:55:03.000000000

The change could not be merged due to a path conflict.

Please rebase the change locally and upload the rebased commit for review.

-------------------------------------
author: Kaylin Maxwell
date: 2013-08-31 04:55:34.000000000

Change has been successfully cherry-picked as 92b3a9db132718547e4f3f16f5f9faaaf431c1ab

-------------------------------------
