OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd2bcc2 a5094db)
am a5094db1: am cd1e7f7b: (-s ours) am 45fcaa54: Merge "Don\'t wipe device because...
authorJim Miller <jaggies@google.com>
Thu, 27 Aug 2015 19:20:32 +0000 (19:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:20:32 +0000 (19:20 +0000)
* commit 'a5094db1a83e077e2075942c3925b8806f34cbcb':


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