OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4de51e4) | patch
Conflict resolution CL to ag/868720 when cp'ing to mnc-mr1-release
authorZach Jang <zachjang@google.com>
Sat, 27 Feb 2016 00:06:28 +0000 (16:06 -0800)
committerZach Jang <zachjang@google.com>
Sat, 27 Feb 2016 00:11:56 +0000 (00:11 +0000)
commitb22f3f2d93df118092449500177c9d07b08bbe91
treef7910dde595cdd7b09e374764a713882b7a8699ctree | snapshot
parent4de51e4130c76562e5d4a13b56bd204b9d92f4e7commit | diff
Conflict resolution CL to ag/868720 when cp'ing to mnc-mr1-release

Change-Id: I3efe5476ebd758fc567bfdb035583a01c45aea8b
services/core/java/com/android/server/content/SyncStorageEngine.java diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help