Jim Miller 9b4b662c27 resolved conflicts for merge of 6825c478 to master ...

Change-Id: Id9657db0b3623c329ae2cff3916c2d0eb4301dd7

2013-04-17 16:27:30 -07:00

..

com/android/server

resolved conflicts for merge of 6825c478 to master

2013-04-17 16:27:30 -07:00

Android.mk

Remove obsolete variables.

2012-08-21 17:24:03 -07:00