Kenny Root 1d69bad411 resolved conflicts for merge of a98b0ff8 to master ...

Change-Id: I1f4a952d360c48426e22a7772726b6867cc19771

2013-05-07 10:14:46 -07:00

..

com/android/server

resolved conflicts for merge of a98b0ff8 to master

2013-05-07 10:14:46 -07:00

Android.mk

Remove obsolete variables.

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