Dianne Hackborn f41d25a2f5 resolved conflicts for merge of 8bb779bd to master ...

Change-Id: I72ddc0a67cf55d45958a622ffe535f32c1721052

2012-09-12 10:55:03 -07:00

..

com/android/server

resolved conflicts for merge of 8bb779bd to master

2012-09-12 10:55:03 -07:00

Android.mk

Remove obsolete variables.

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