Tyler Gunn 5a52c9806d resolve merge conflicts of 5ea76c1 to master ...

Test: Compiled code using make -j32
Change-Id: I0c0a5cd79fba9a9c9cf9306e91dc0e9f1979a299

2016-09-26 12:21:52 -07:00

..

java

docs: improve docs for sqlite package summary am: 59640a9f1c am: 195099dc32

2016-09-26 17:53:18 +00:00

jni

SurfaceView: Force surface disconnection before reuse. am: 387838be95 am: 288ce4fc42

2016-09-24 01:57:54 +00:00

res

resolve merge conflicts of 5ea76c1 to master

2016-09-26 12:21:52 -07:00

tests

Remove ability to set frequency from WifiAssociationTest am: 93ce63760d am: 4bec7b53b0 am: a04b2b5f36

2016-09-24 01:53:01 +00:00