OSDN Git Service

resolve merge conflicts of cb29c97907f3 to nyc-mr2-dev-plus-aosp
authorAlain Vongsouvanh <alainv@google.com>
Fri, 6 Jan 2017 00:11:25 +0000 (16:11 -0800)
committerAlain Vongsouvanh <alainv@google.com>
Fri, 6 Jan 2017 00:11:25 +0000 (16:11 -0800)
commitc89202e177e7a6be1e489b6721621cf903d9e6fb
tree79933197230915de543196af21675d97d3f75a0b
parent2b555e366e64569001fdfc6116e8c2a553c22e5d
parentcb29c97907f32141f5b988c023606d42bb963222
resolve merge conflicts of cb29c97907f3 to nyc-mr2-dev-plus-aosp

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