Kenny Root 232b4d60a6 resolved conflicts for merge of c16da6aa to master ...

Change-Id: Ibaaf2995def15573609562162902b3d73dd78ec0

2013-04-02 10:57:10 -07:00

..

com/android/server

resolved conflicts for merge of c16da6aa to master

2013-04-02 10:57:10 -07:00

Android.mk

Remove obsolete variables.

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