OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e886f0 1b6044f)
Merge "Avoid exposing OffloadCallbackEvent values" am: aff0d1afb6 am: 74868feecd
authorErik Kline <ek@google.com>
Wed, 12 Jul 2017 18:08:25 +0000 (18:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 18:08:25 +0000 (18:08 +0000)
am: 1b6044f363  -s ours

Change-Id: I2f2ac148c3a2042d3a96013a14e1efd92886c241


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help