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

Change-Id: Ice485967fa96f13786024b6939b826638e906ff0

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

..

jni

constify JNINativeMethod function pointer tables

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

res

Import translations. DO NOT MERGE

2015-07-15 14:17:17 -07:00

src/com/android/printspooler

Instrument printing service for metrics collection.

2015-07-30 16:29:20 -04:00

Android.mk

…

AndroidManifest.xml

…

MODULE_LICENSE_APACHE2

…

NOTICE

…