OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3609c55 ad7d95b)
am ad7d95bd: (-s ours) am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev
authorAndrew Solovay <asolovay@google.com>
Thu, 27 Aug 2015 10:35:35 +0000 (10:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:35:35 +0000 (10:35 +0000)
* commit 'ad7d95bdcf849d9a13c0ff021beb1c7692e419ea':


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