OSDN Git Service

resolve merge conflicts of 54bce9c6ff1f to nyc-mr2-dev-plus-aosp
authorJason Monk <jmonk@google.com>
Wed, 18 Jan 2017 18:45:59 +0000 (13:45 -0500)
committerJason Monk <jmonk@google.com>
Wed, 18 Jan 2017 18:45:59 +0000 (13:45 -0500)
commit8cff199b09d6f4fe6e6aca944a8c047df5c8b7f6
treed6d7d179cc29c9963a5f87eb3712ddc3c29ee9e2
parent1a2a860d2c7c6c3b9c99ed302d391973496cccfc
parent54bce9c6ff1f42d130b84f228e265b331a388f80
resolve merge conflicts of 54bce9c6ff1f to nyc-mr2-dev-plus-aosp

Change-Id: Ifaea1d0f58ea81a7d929dc891fe69c8d7c15af4e
packages/SystemUI/res/values/strings.xml
proto/src/metrics_constants.proto