Amith Yamasani 888eb73c6e resolved conflicts for merge of 814f5ac3 to jb-mr1-dev ...

Change-Id: Ic65395ce932971dc9c37a481aa96da79a45d0f12

2012-09-24 09:26:37 -07:00

..

com/android/server

resolved conflicts for merge of 814f5ac3 to jb-mr1-dev

2012-09-24 09:26:37 -07:00

Android.mk

Remove obsolete variables.

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