Adam Powell 64e2b71893 resolved conflicts for merge of 6e9a021e to master ...

Change-Id: I5ea823b752e78cb9d2ef7ccec68addbaa9ca66e9

2010-09-30 13:09:43 -07:00

..

config

…

java

resolved conflicts for merge of 6e9a021e to master

2010-09-30 13:09:43 -07:00

jni

Add MotionEvent Matrix transformations.

2010-09-30 11:52:48 -07:00

res

am 97708b19: am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread

2010-09-30 11:00:01 -07:00

tests

Manual merge: Move DownloadManager to android.app

2010-09-28 17:28:43 -07:00