OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d16495 6ceed53)
am 6ceed53e: (-s ours) am e022cb08: Merge "Don\'t attempt to stop the receive thread...
authorLorenzo Colitti <lorenzo@google.com>
Thu, 27 Aug 2015 10:19:13 +0000 (10:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:19:13 +0000 (10:19 +0000)
* commit '6ceed53eeb6d14bb5dbf1f5ae719ad2722de9fb5':


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