OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2c5cbd4 0f97b8f)
resolve merge conflicts of 0f97b8f to nyc-mr1-dev
authorChris Wren <cwren@android.com>
Fri, 27 May 2016 02:28:03 +0000 (22:28 -0400)
committerChris Wren <cwren@android.com>
Fri, 27 May 2016 02:28:03 +0000 (22:28 -0400)
commit5b3b72e7b7a926ac954db23c2ceaf10aa9b32539
treee4275f55b781da18cb05e0c0064522a85984e4f8tree | snapshot
parent2c5cbd4012aef736c94a7afc84a778623c639d10commit | diff
parent0f97b8fcbddbbd40f5cf45ba57a5d9db48a611a0commit | diff
resolve merge conflicts of 0f97b8f to nyc-mr1-dev

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