Brian Carlstrom cd4a962a84 am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev ...

* commit '13987fb43255ccb3802d415e32b1c5caf14291bb':
  Reverting public setSoWriteTimeout

2012-09-26 16:09:03 -07:00

..

java

am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev

2012-09-26 16:09:03 -07:00

jni

am 2832136b: Merge "Implement android.media.AudioManager.getProperty()" into jb-mr1-dev

2012-09-26 08:53:23 -07:00

res

am fddedc94: Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev

2012-09-26 11:17:55 -07:00

tests

Fix Wifi Stress test after wifi settings are moved to Settings.global

2012-09-26 09:23:59 -07:00