Nick Pelly 98ce4a43a4 am 4c8fda62: am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread ...

Merge commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf'

* commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf':
  Fixed NdefTag parcelable conversion methods.

2010-10-25 09:24:41 -07:00

..

config

…

java

am 4c8fda62: am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread

2010-10-25 09:24:41 -07:00

jni

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

2010-10-24 18:42:12 -07:00

res

Merge "Provide strings for text selection options in WebView."

2010-10-25 06:25:24 -07:00

tests

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

2010-10-22 18:31:31 -07:00