Nick Pelly d6abaf326b am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread ...

Merge commit '145550a00ea59ff20133acc95315e463628e16db' into gingerbread-plus-aosp

* commit '145550a00ea59ff20133acc95315e463628e16db':
  Document getPollBytes() and getActivationBytes().

2010-10-24 22:11:52 -07:00

..

config

…

java

am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread

2010-10-24 22:11:52 -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