OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75c6b8c 16090c6)
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 20:23:04 +0000 (20:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:23:04 +0000 (20:23 +0000)
am: 16090c6177  -s ours

Change-Id: I25ba4f5731ecaed22faa95e3948e389405dca7e7


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