Patrik Torstensson 23a3f240c0 Merge "Incorporate slab reclaimable into meminfo" into oc-mr1-dev am: 20fb01eb23 ...

am: 7528452f57

Change-Id: I46c0b4b07044578fe300aaf587973a650628388b

2017-10-15 02:09:14 +00:00

..

java

Merge "Incorporate slab reclaimable into meminfo" into oc-mr1-dev am: 20fb01eb23

2017-10-15 02:09:14 +00:00

jni

Merge "Incorporate slab reclaimable into meminfo" into oc-mr1-dev am: 20fb01eb23

2017-10-15 02:09:14 +00:00

proto/android

Implement Activity Manager Broadcasts dump protos

2017-10-11 18:35:14 -07:00

res

Merge "Import translations. DO NOT MERGE"

2017-10-14 19:44:53 +00:00

tests

Merge "Flags to enable/disable smart selection in EditText"

2017-10-13 00:33:44 +00:00