OSDN Git Service

resolve merge conflicts of f757d1e to nyc-mr1-dev-plus-aosp
authorDoris Ling <dling@google.com>
Wed, 24 Aug 2016 01:59:09 +0000 (18:59 -0700)
committerDoris Ling <dling@google.com>
Wed, 24 Aug 2016 02:02:31 +0000 (19:02 -0700)
commit6890d538ae66a1c2769f5bd6eec13656499a932b
tree2156bbc90ada55788498ce584f11b4f862295269
parent9ca6758e0b69673ac1a7fa4e1896404d1f6cd66e
parentf757d1ede88241fd663539098c84021eec71708e
resolve merge conflicts of f757d1e to nyc-mr1-dev-plus-aosp

Change-Id: I1e53b78977bb32fe34462cf46bbfe66626574e65
src/com/android/settings/dashboard/DashboardSummary.java