Dianne Hackborn 25a98b8e21 resolved conflicts for merge of 7f6c6e8f to master ...

Change-Id: Id9dddb78c51f16ff8c4b60339421c94fde506db2

2010-06-30 15:44:58 -07:00

..

android

Implement default key handling for native code.

2010-06-30 10:49:40 -07:00

graphics/jni

For issue #2651381, allow library prelinking.

2010-05-05 18:23:05 -07:00

include/android

am b5f05d00: am 0934fbb6: Merge "Update native activity & event APIs to follow correct conventions." into gingerbread

2010-06-29 12:21:16 -07:00