frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp	Narayan Kamath	2014-03-27	2	-3/+3
\|\
* \|	Move some system services to separate directories	Amith Yamasani	2013-12-19	19	-0/+4684
\|/
*	Deleted the media, camera, drm related files since they are relocated	James Dong	2012-03-28	7	-1305/+0
*	Upintegrate the common_time service from ics-aah.	Mike J. Chen	2012-02-16	7	-0/+1305