Geoffrey Pitsch 3fe668a015 resolve merge conflicts of 180f4ee7f7 to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic6a7751e75899c5faf32bb2b392fa623d6482e7b

2017-07-21 10:35:11 -04:00

..

android

resolve merge conflicts of 180f4ee7f7 to master

2017-07-21 10:35:11 -04:00

com

Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev

2017-07-20 11:29:59 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…