Kenny Root 9396f183c2 resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp ...

Change-Id: I21512d61b5c08cee5fed69b34c3275ba5c3fc0d8

2012-10-19 17:16:41 -07:00

..

com/android/server

resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp

2012-10-19 17:16:41 -07:00

Android.mk

Remove obsolete variables.

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