OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46ece99 514154e)
am 514154e4: am cc8555bf: (-s ours) am c4e2bcd4: Merge "Fix issue #22460110: AssistSt...
authorDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2015 17:22:46 +0000 (17:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 17:22:46 +0000 (17:22 +0000)
* commit '514154e4481c1ea2fde148d6a8ed9263271f30ed':


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