Yohann Roussel dd6f64e3af Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks" am: 43c98c74fe am: ef5d1cb3b4 am: 1c0070aa5d ...

am: 46848cada3

Change-Id: I8703a23d833bd54cff281e4ba29b236dc9d76125

2017-01-06 09:53:42 +00:00

..

java

Merge "PackageManagerService: Implement packageParser cache in ParallelPackageParser."

2017-01-06 09:14:03 +00:00

jni

Merge "HwBinder: get/register checked exceptions." am: 9ec4fec5ca

2017-01-06 01:09:26 +00:00

proto/android

Clean up file names for protos

2016-12-20 22:28:56 -08:00

res

resolve merge conflicts of cb29c97907 to nyc-mr2-dev-plus-aosp

2017-01-05 16:11:25 -08:00

tests

Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks" am: 43c98c74fe am: ef5d1cb3b4 am: 1c0070aa5d

2017-01-06 09:53:42 +00:00