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

Change-Id: Ice485967fa96f13786024b6939b826638e906ff0

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

..

java

Remove uids with empty history from NetworkStats uid enumeration

2015-08-14 16:21:52 +01:00

jni

constify JNINativeMethod function pointer tables

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