Elliott Hughes 6e7affeb3d am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp ...

* commit 'b8292830f79fc76ffb9a1be5cd316212ac494d03':
  Switch frameworks/base over from @hidden Charsets to public StandardCharsets.

2013-06-28 16:53:27 -07:00

..

bandwidthtests

Clean up scan handling

2013-02-22 09:23:55 -08:00

benchmarks

Cache AndroidBlockGuardPolicy to avoid allocation.

2013-06-14 16:15:31 -07:00

bluetoothtests

…

ConnectivityManagerTest

Disable a flaky test case

2013-06-17 17:14:10 -07:00

coretests

resolved conflicts for merge of fca0f92e to stage-aosp-master

2013-06-28 16:41:19 -07:00

hosttests

Make download manager tests more reliable.

2013-04-09 15:08:43 -07:00

inputmethodtests

…

notificationtests

…

overlaytests

…

systemproperties

…

utillib

…