Jeff Sharkey afcd1135c3 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 ...

am: df42d732f8

Change-Id: Ib7efd9dacf476d8a717456d8e6fc7ee617483d17

2016-09-16 23:14:51 +00:00

..

android

Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537

2016-09-16 23:14:51 +00:00

com

Fix vulnerability in LockSettings service

2016-08-17 22:59:27 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…