tree fab25a32126e425c3140828152d659889406dbca
parent 931fcc613c075caa88fefa7d87ccf794aac410a8
parent 0a5867d5bd47cc69dbc9fc132feb1482c1e1f006
author Fred Quintana <fredq@google.com> 1323132577 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323132577 -0800

am f3f7d65b: am b5f2dfbc: Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don\'t have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1

* commit 'f3f7d65b650dec7f4eacefa1f0174fadfce5ec6e':
  By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()