Wei Wang 78011ba9db am de35f0d9: Merge "setCallbackType should be public for onlost/onfound apis" into mnc-dev ...

* commit 'de35f0d9525d0ca0cd109a9e848a3885bd9c3c1d':
  setCallbackType should be public for onlost/onfound apis

2015-05-19 22:13:45 +00:00

..

java

Merge "setCallbackType should be public for onlost/onfound apis" into mnc-dev

2015-05-19 22:10:24 +00:00

jni

Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev

2015-05-19 17:58:11 +00:00

res

am 6246ade0: Merge "Remove controlBackground attribute, replace with direct reference" into mnc-dev

2015-05-19 17:19:44 +00:00

tests

Merge "Fix Cancelling a text action activity deletes the selected text" into mnc-dev

2015-05-19 10:42:20 +00:00