Philip P. Moltmann 492a058d58 resolve merge conflicts of d043a840f7 to nyc-mr2-dev-plus-aosp ...

am: b02f8eb241

Change-Id: I1307ea308423c0fd34564d788ab64c023a5be2c5

2017-02-14 18:28:25 +00:00

..

android

resolve merge conflicts of d043a840f7 to nyc-mr2-dev-plus-aosp

2017-02-14 18:28:25 +00:00

com

Merge "AOD: Fix contrast calculation"

2017-02-14 13:18:22 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…