OSDN Git Service

Merge "Ensure the generation is not changed before put value to cache" am: 11ae580f81...
authorxulicheng <xulicheng@xiaomi.com>
Mon, 28 Aug 2017 20:21:45 +0000 (20:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 28 Aug 2017 20:21:45 +0000 (20:21 +0000)
commit4755a1a41a09408c3be7fda14585598cc14a66d2
treefa5b6c6bab01a31259d897ff9f40d3ac90553e29
parent4d3914ac7549d6412a1533cf08a1bd301cd812bd
parent848cde3bebefcc5ecf33a6822c5865489dcede74
Merge "Ensure the generation is not changed before put value to cache" am: 11ae580f81 am: 489f2c2c48
am: 848cde3beb

Change-Id: I52b5811ab3aab9bda73d1c4706858e3e8a70bef2
core/java/android/provider/Settings.java