OSDN Git Service

Merge "ConcurrentModificationException in SyncManager"
authorMatthew Williams <mjwilliams@google.com>
Thu, 10 Dec 2015 18:16:19 +0000 (10:16 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 Dec 2015 18:16:19 +0000 (10:16 -0800)
commit1db19fc70e24bc5e3c6d77f2b9a5374c372e46cd
tree10255541901ca482b968ebd303bb1e3a8ea8ac62
parent0a8c81a2046753f08c036ec68a15778e0c0dade4
parent7e4d92fbc7761d561c1bc61dc5cf55b69d3a54f3
Merge "ConcurrentModificationException in SyncManager"
am: 7e4d92fbc7

* commit '7e4d92fbc7761d561c1bc61dc5cf55b69d3a54f3':
  ConcurrentModificationException in SyncManager
services/core/java/com/android/server/content/SyncManager.java