Fred Quintana 9a3e16ffa8 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 'b5f2dfbc221d3dc799232e0ada3b6621d3d4d597':
  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()

2011-12-05 16:47:15 -08:00

..

java

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

2011-12-05 16:47:15 -08:00

jni

am 003c15d7: Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1

2011-12-05 10:42:33 -08:00

res

am da926cf2: Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1

2011-12-05 15:04:28 -08:00

tests

Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1

2011-12-05 15:52:34 -08:00