OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5760f15 8c831b2)
resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aosp
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 6 Jan 2015 22:46:27 +0000 (14:46 -0800)
committerDeepanshu Gupta <deepanshu@google.com>
Tue, 6 Jan 2015 22:46:27 +0000 (14:46 -0800)
Change-Id: I8894287fd43afc863d070cab04cfaa1bf70f7ebb


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