Nicolas Geoffray 4414db2da2 Merge "resolve merge conflicts of 255b69aca0 to oc-dev-plus-aosp" into oc-dev-plus-aosp ...

am: b118505ef0

Change-Id: I6e9963188b487de4e76dc0d17d56b53050fd3745

2017-05-26 10:20:39 +00:00

..

android

Merge "resolve merge conflicts of 255b69aca0 to oc-dev-plus-aosp" into oc-dev-plus-aosp

2017-05-26 10:20:39 +00:00

com

Merge "Backup / restore additional lock screen settings"

2017-05-26 09:51:42 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…