OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92f58f7 87c1e1b)
am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e...
authorDan Sandler <dsandler@android.com>
Sun, 16 Aug 2015 02:54:36 +0000 (02:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 16 Aug 2015 02:54:36 +0000 (02:54 +0000)
* commit '87c1e1b8a1f6927d2c31375e83fd353110edd326':
  "I tried to think of the most harmless thing."


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