Kurt Nelson 1981f4292d Use annotation instead of comment ...

Test: none
Bug: none
Change-Id: I723fba865116a203147dd5f2a6343b2cb29c65a2

2017-10-25 13:53:29 -07:00

..

java

Use annotation instead of comment

2017-10-25 13:53:29 -07:00

jni

Merge "Throw clear error if a row doesn't fit into CursorWindow"

2017-10-23 18:44:23 +00:00

proto/android

Merge "incidentd: dumping batterystats app data to proto"

2017-10-20 23:22:48 +00:00

res

Merge "[Magnifier - 6] Simplify API and configuration"

2017-10-24 14:37:53 +00:00

tests

Merge changes from topic "delete_setWifiApEnabled"

2017-10-24 16:10:41 +00:00