am 7e5cd796: (-s ours) am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread

* commit '7e5cd7968356ea111988a372095e352d76476994':
  [don't auto-merge] Don't re-read SharedPreferences unnecessarily.
tree: aad37749d50f5e3bdd41946934aec27284cc4b77
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE