Elliott Hughes b57dd722f1 resolved conflicts for a884d81e to stage-aosp-master ...

Change-Id: Ice485967fa96f13786024b6939b826638e906ff0

2015-09-24 10:01:32 -07:00

..

com/android/net

…

jni

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

res/values

…

src/com/android/pacprocessor

Do not throw NullPointerException from PacService

2015-01-16 15:57:55 -05:00

Android.mk

Build PacProcessor for 64 bit.

2014-05-27 17:06:18 +01:00

AndroidManifest.xml

…