Glenn Kasten f7b4fd24e3 resolve merge conflicts of c76a3ac to stage-aosp-master ...

am: 67ffd5e617

Change-Id: Ib2d89672efe8757edff320d5ed800b7b0293323b

2016-08-17 21:07:54 +00:00

..

android

Limit capabilities of a11y gesture dispatch.

2016-08-12 21:05:00 +00:00

com

resolve merge conflicts of c76a3ac to stage-aosp-master

2016-08-17 13:28:04 -07:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…