Google Git Google Git
Sign in
android/platform/frameworks/base/5bc32b347f83099772fe5596615d88e4d0a7d813
commit
5bc32b347f83099772fe5596615d88e4d0a7d813
[log]
author
Elliott Hughes <enh@google.com>
Thu Jul 18 09:43:04 2013 -0700
committer
Android Git Automerger <android-git-automerger@android.com>
Thu Jul 18 09:43:04 2013 -0700
tree
ce272a99f32d6916d3a032cfd1da18d06b13a636
parent
230e0120a4d7bb83f01c41760256a3c5e3f5a585 [diff]
parent
03a152d7e72f05456a463f2709ce787119e86f03 [diff] 
am 03a152d7: am 15cb526e: Merge "Fix import after okhttp update."

* commit '03a152d7e72f05456a463f2709ce787119e86f03':
  Fix import after okhttp update.
tree: ce272a99f32d6916d3a032cfd1da18d06b13a636
  1. api/
  2. cmds/
  3. core/
  4. data/
  5. docs/
  6. drm/
  7. graphics/
  8. include/
  9. keystore/
  10. libs/
  11. location/
  12. media/
  13. native/
  14. nfc-extras/
  15. obex/
  16. opengl/
  17. packages/
  18. policy/
  19. samples/
  20. sax/
  21. services/
  22. telephony/
  23. test-runner/
  24. tests/
  25. tools/
  26. wifi/
  27. Android.mk
  28. CleanSpec.mk
  29. MODULE_LICENSE_APACHE2
  30. NOTICE
  31. preloaded-classes