OSDN Git Service

resolved conflicts for merge of 8ad3e817 to mnc-dr-dev
authorDaniel Sandler <dsandler@android.com>
Sat, 15 Aug 2015 04:16:41 +0000 (00:16 -0400)
committerGeoff Mendal <mendal@google.com>
Sat, 15 Aug 2015 07:03:09 +0000 (00:03 -0700)
commit8dcda391c79e8c2fd20a87834f1f61645aa771ea
treed8627d43359f158bc82ea3aff9e02a7838a4ab41
parent479c482ca1788235afc776125eb6a79f1d9281c8
resolved conflicts for merge of 8ad3e817 to mnc-dr-dev

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