Ivan Podogov 903d6414e5 resolve merge conflicts of b1e2da7 to nyc-mr1-dev-plus-aosp ...

Test: build police
Change-Id: Ifec1ab6760ebb94b0b411c9c60f07066e151206b

2016-12-13 17:55:14 +00:00

..

android

resolve merge conflicts of b1e2da7 to nyc-mr1-dev-plus-aosp

2016-12-13 17:55:14 +00:00

com

Merge "Final push of installd to Binder; goodbye socket!" am: 1950377f91

2016-12-10 23:07:59 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…