Joe LaPenna 248b40bfac Merge "Allow setting doze timeouts based on system feature" into nyc-dev ...

am: 23c63dd

* commit '23c63dd65f304d554bc6cbf2f6016e6e9c8e4f4e':
  Allow setting doze timeouts based on system feature

2016-03-24 18:24:34 +00:00

..

android

Merge "Allow setting doze timeouts based on system feature" into nyc-dev

2016-03-24 18:24:34 +00:00

com

Merge changes I16312592,Iadfc226e into nyc-dev

2016-03-24 18:00:11 +00:00

org/apache/http

org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser

2016-01-21 17:04:58 +00:00

jarjar-rules.txt

…

overview.html

…