Scott Main 177b05d614 am abb50f15: Merge "docs: fix a couple api links" into gingerbread ...

Merge commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd' into gingerbread-plus-aosp

* commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd':
  docs: fix a couple api links

2010-10-25 11:27:55 -07:00

..

config

…

java

am abb50f15: Merge "docs: fix a couple api links" into gingerbread

2010-10-25 11:27:55 -07:00

jni

am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread

2010-10-24 18:38:11 -07:00

res

am 67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread

2010-10-22 16:08:27 -07:00

tests

am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread

2010-10-22 18:21:09 -07:00