OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a40908 93db3d4)
resolved conflicts for 93db3d4b to cw-e-dev
authorPirama Arumuga Nainar <pirama@google.com>
Fri, 9 Oct 2015 17:29:03 +0000 (10:29 -0700)
committerPirama Arumuga Nainar <pirama@google.com>
Fri, 9 Oct 2015 17:29:03 +0000 (10:29 -0700)
Change-Id: I264c09c2cc7e9f0e3b1a83a52c965238aab55aae


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