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

Merge commit '29f28cdc5315d11919595bf8623d6a67797a34e7' into gingerbread-plus-aosp

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

2010-10-14 12:03:19 -07:00

..

config

…

java

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

2010-10-14 12:02:44 -07:00

jni

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

2010-10-13 22:54:10 -07:00

res

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

2010-10-14 12:03:19 -07:00

tests

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

2010-10-13 22:54:10 -07:00