OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 36beeef 7980b19)
resolve merge conflicts of 7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp...
authorNeil Fuller <nfuller@google.com>
Fri, 6 Jul 2018 15:32:44 +0000 (16:32 +0100)
committerNeil Fuller <nfuller@google.com>
Fri, 6 Jul 2018 15:32:44 +0000 (16:32 +0100)
commit3147288c3bf55f07a81096db1595b247ac4ee65f
tree6c577b0244e7de66554aead8a73eb0b3f84be221tree | snapshot
parent36beeefc84ddf6062a862bbc378d2f3719d96c0ccommit | diff
parent7980b19bc8fa1fb0c4b4b3abea891d6e245b3eddcommit | diff
resolve merge conflicts of 7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp-master

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ica0d3578c6e3fcd17b350f63b4acd471774ac014
core/java/android/util/LongArray.java diff1 | diff2 | blob | history
core/java/com/android/internal/util/ArrayUtils.java diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help