Jeff Davidson 7074cb84f0 Merge "eUICC API error code cleanup." into oc-dr1-dev ...

am: 93a59696ad

Change-Id: Ie12b3809b3819028965d50653db8147dadf3bcdb

2017-06-15 03:42:02 +00:00

..

java

Merge "eUICC API error code cleanup." into oc-dr1-dev

2017-06-15 03:42:02 +00:00

jni

Merge "Add a workaround for simulate secondary display" into oc-dev am: 31443a17e8

2017-06-14 20:31:11 +00:00

proto/android

Prune unused static libs and instant apps if space needed am: f36d53cbfc

2017-05-31 03:59:35 +00:00

res

Merge "Protect broadcast used in settings for bond cancel" into oc-dev

2017-06-13 01:04:55 +00:00

tests

Copy smearing method to BatteryStatsHelper

2017-06-09 21:15:56 +00:00