OSDN Git Service

resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp
authorRobin Lee <rgl@google.com>
Wed, 29 Mar 2017 12:54:02 +0000 (13:54 +0100)
committerRobin Lee <rgl@google.com>
Wed, 29 Mar 2017 12:54:02 +0000 (13:54 +0100)
commit27ae2bb1feef38dd5e58ad8886344f2968558102
tree567b8d806ea8b153b2e6dbb94d0192639550c7d7
parent530c6dbbd8cc4e208eb35507a99e39dbdcf68c90
parent86c72f7ea54a733576448ca11975133eeec1ecff
resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp

Test: make RunSettingsRoboTests -j
Change-Id: If6b87d1caa358335ce56201eab0ed8add8b339e9
src/com/android/settings/datausage/AppDataUsage.java