tree a87ea5a69386cedc21cca4b54505bcf1f3d7d08a
parent 955450d604f6273c337d0eb1e5f453729db8d428
parent c8b70f298200889bc91b060fed072b4ac26257b9
author Scott Main <smain@google.com> 1272580122 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272580122 -0700

am cd845f37: am 1d328033: am 764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo