OSDN Git Service

resolve merge conflicts of 2fda2ce15958 to nyc-mr1-dev-plus-aosp
authorAlain Vongsouvanh <alainv@google.com>
Thu, 5 Jan 2017 23:27:37 +0000 (15:27 -0800)
committerAlain Vongsouvanh <alainv@google.com>
Thu, 5 Jan 2017 23:27:37 +0000 (15:27 -0800)
commit5549258eea588b82fe8c0690062d2c543f7bf3a1
tree8cbd3d13b75e579d539f0ccf3c2e3f5d7ed2f09b
parent2cb75e822dec8e9f7e589f08d37ed4f09b3a1513
parent2fda2ce1595840d9bcefe3947187fcaf842e5ef6
resolve merge conflicts of 2fda2ce15958 to nyc-mr1-dev-plus-aosp

Change-Id: Ia35164bd4ea262fa72afb7b78a47b0e4f0ef96ba
core/res/res/values/symbols.xml