Jorim Jaggi 526694ea52 resolve merge conflicts of 3c1b0f0 to master ...

Change-Id: I2314728cba47c28ff580f4dfc69868f8cb5ff5db

2016-08-03 16:23:28 +00:00

..

android

resolve merge conflicts of 3c1b0f0 to master

2016-08-03 16:23:28 +00:00

com

Merge "Have BatteryStats track and report the running wakelocks."

2016-08-03 01:49:50 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…