Dianne Hackborn 594ea5f8b0 Merge "Implement issue #34842682: Add ability to limit permissions based on features"

2017-03-02 18:31:15 +00:00

..

java

Merge "Implement issue #34842682: Add ability to limit permissions based on features"

2017-03-02 18:31:15 +00:00

jni

Merge "getTransport checks interface and instance names." am: 7f0300f1e2 am: 7719c1ad0d

2017-03-01 23:46:09 +00:00

proto/android

Merge "Protobufferize PowerManager dumpsys"

2017-02-24 21:36:19 +00:00

res

Merge "Implement issue #34842682: Add ability to limit permissions based on features"

2017-03-02 18:31:15 +00:00

tests

Merge "Change MaskableBitmap to AdaptiveBitmap Test: $ make dist -j30 b/35399620"

2017-03-02 15:15:43 +00:00