Kenny Root bd549fe0bb am 7dbf0696: resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp ...

* commit '7dbf0696ef37097f2bcec058f876f7f4ba63d357':
  Make ObbActionListener a on-way call

2011-01-26 11:43:31 -08:00

..

config

…

java

am 7dbf0696: resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp

2011-01-26 11:43:31 -08:00

jni

usb: correct return type of android_hardware_UsbDevice_claim_interface

2011-01-25 21:13:11 -08:00

res

am 721a2253: am 93a0110e: Merge "New stat_notify icons in hdpi and mdpi" into honeycomb

2011-01-26 09:17:17 -08:00

tests

am 588b1e45: Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb

2011-01-21 14:28:52 -08:00