OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 91b43d5 18455a9)
resolve merge conflicts of 18455a9 to master
authorChris Wren <cwren@android.com>
Thu, 2 Jun 2016 21:04:35 +0000 (17:04 -0400)
committerChris Wren <cwren@android.com>
Thu, 2 Jun 2016 21:04:35 +0000 (17:04 -0400)
commit6343cb5acd6b375cd4e2129e5709ee765e421f48
treee92f9043917665f9cc7cdee49ca993b239210721tree | snapshot
parent91b43d50fd5ee7bd89cace7f849e298c13f57f7dcommit | diff
parent18455a9108f36e6577f2eebdbeb7781a0ad4751fcommit | diff
resolve merge conflicts of 18455a9 to master

Change-Id: I06da8fa1601633baad82be50ae881462d33ff27e
proto/src/metrics_constants.proto diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help