OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2e6df3 cb9d39e)
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black" am: 2f6b711ffa...
authorAndrew Rossignol <aarossig@google.com>
Tue, 17 Jan 2017 19:19:01 +0000 (19:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Jan 2017 19:19:01 +0000 (19:19 +0000)
am: cb9d39e438  -s ours

Change-Id: I75af3d982854efe6a1b71cb5aa7d433c325a2f2b


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