xulicheng 4755a1a41a Merge "Ensure the generation is not changed before put value to cache" am: 11ae580f81 am: 489f2c2c48 ...

am: 848cde3beb

Change-Id: I52b5811ab3aab9bda73d1c4706858e3e8a70bef2

2017-08-28 20:21:45 +00:00

..

java

Merge "Ensure the generation is not changed before put value to cache" am: 11ae580f81 am: 489f2c2c48

2017-08-28 20:21:45 +00:00

jni

Merge "Use /proc/pid/smaps_rollup when available" into oc-mr1-dev

2017-08-23 03:54:08 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

2017-07-21 15:51:32 +00:00

res

Merge "Add new system API for stable display size" into oc-mr1-dev

2017-08-25 21:02:36 +00:00

tests

Merge changes from topic "siyamed_maxlines" into oc-mr1-dev

2017-08-24 19:59:22 +00:00