Elliott Hughes 9962ed5575 am 93241de7: Merge "Remove a bitrotted test." ...

automerge: ba6982a

* commit 'ba6982a16cb3b9f6196fdac11d1d90a02eb32cfd':
  Remove a bitrotted test.

2014-12-18 02:40:10 +00:00

..

java

am 9f48e316: am e2ed349c: Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev

2014-12-18 00:26:16 +00:00

jni

am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java."

2014-12-17 19:42:08 +00:00

res

am 1e63f414: am 776164da: Merge "Removing unwanted tethering profiles from config.xml" into lmp-mr1-dev

2014-12-18 00:54:48 +00:00

tests

am 93241de7: Merge "Remove a bitrotted test."

2014-12-18 02:40:10 +00:00