Roy West ecc105668c am d23cc4b8: am 29f28cdc: Merge "Change storage names to match 10-13 decision" into gingerbread ...

Merge commit 'd23cc4b814c01675f6503c4dcab21655c56d0256'

* commit 'd23cc4b814c01675f6503c4dcab21655c56d0256':
  Change storage names to match 10-13 decision

2010-10-15 14:26:08 -07:00

..

config

…

java

am 4fa7f4f4: am 53ea7f58: Merge "Really leave text selection mode when using the trackball." into gingerbread

2010-10-15 14:25:48 -07:00

jni

am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread

2010-10-15 14:00:58 -07:00

res

am d23cc4b8: am 29f28cdc: Merge "Change storage names to match 10-13 decision" into gingerbread

2010-10-15 14:26:08 -07:00

tests

am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread

2010-10-15 14:00:58 -07:00