Mike Lockwood 06d4329f38 Merge "WifiStateMachine: Move wifi teardown delay to a framework resource" into ics-aah

2012-02-19 12:56:53 -08:00

..

java

am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks

2012-02-17 15:25:53 -08:00

jni

am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1

2012-01-13 13:12:41 -08:00

res

Merge "WifiStateMachine: Move wifi teardown delay to a framework resource" into ics-aah

2012-02-19 12:56:53 -08:00

tests

am 2d559b53: Merge "fix NPE in race condition." into ics-mr1

2012-02-17 15:55:49 -08:00