Fred Quintana 5db771f49c am fbbe2cd2: am 055e4ea5: Merge change Ief544bc6 into eclair-mr2 ...

Merge commit 'fbbe2cd28a7185fb1a64d780a8839494f9cbe866'

* commit 'fbbe2cd28a7185fb1a64d780a8839494f9cbe866':
  fix grammar in the grant permissions UI

2009-10-16 11:36:00 -07:00

..

config

…

java

am 5e6aa492: am 2086152c: am f55aa972: Merge change I01935be3 into eclair

2009-10-16 09:59:13 -07:00

jni

am aeed585d: am 43f2b4e9: am 53f33d84: Revert "Remove STOPSHIP comment."

2009-10-14 15:51:13 -07:00

res

am fbbe2cd2: am 055e4ea5: Merge change Ief544bc6 into eclair-mr2

2009-10-16 11:36:00 -07:00