Kenny Root f80d45bfc4 resolved conflicts for merge of 3424b817 to master ...

Change-Id: Idb5bb208aa6aca66744fe6988029d22e739cc67b

2013-04-30 08:45:12 -07:00

..

com/android/server

resolved conflicts for merge of 3424b817 to master

2013-04-30 08:45:12 -07:00

Android.mk

Remove obsolete variables.

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