Fred Quintana fbbe2cd28a am 055e4ea5: Merge change Ief544bc6 into eclair-mr2 ...

Merge commit '055e4ea56c42e714dc471d86311f64437f4ed786' into eclair-mr2-plus-aosp

* commit '055e4ea56c42e714dc471d86311f64437f4ed786':
  fix grammar in the grant permissions UI

2009-10-16 11:26:20 -07:00

..

config

…

java

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

2009-10-16 09:48:30 -07:00

jni

am 53f33d84: Revert "Remove STOPSHIP comment."

2009-10-14 12:37:06 -07:00

res

Merge change Ief544bc6 into eclair-mr2

2009-10-16 14:16:13 -04:00