Christopher Tate 267097b00b DO NOT MERGE: Don't crash when we get a drag-ended after being detached ...

Removing view groups during a drag would cause an NPE here.  The
child views will still get the drag-ended event as expected.

(Cherrypicked from downstream)

Bug 8298439

Change-Id: Ic14cbf9fdc305b91c1627f6882a45d34ee1c34ae

2013-03-04 14:02:29 -08:00

..

java

DO NOT MERGE: Don't crash when we get a drag-ended after being detached

2013-03-04 14:02:29 -08:00

jni

jni: net.TrafficStats: fix getIfaceStat, have it use the iface.

2013-03-04 18:53:07 +00:00

res

Import translations. DO NOT MERGE

2013-03-01 08:55:13 -08:00

tests

Merge "Clean up scan handling"

2013-02-22 18:40:24 +00:00