Jeff Sharkey 3bb8c85418 Merge commit '1db64c19' into merge3 ...

Change-Id: I0aea6817876a5820a7d67a4de5bef0f86ce702a2

2015-07-06 17:25:00 -07:00

..

android

Merge commit '1db64c19' into merge3

2015-07-06 17:25:00 -07:00

com

am a9ede6c2: am e7cd9001: am 85be0c4e: Fix app ops aidl as it is also used from native.

2015-07-06 12:59:00 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…