OSDN Git Service

am 5eb1f1fb: am f1b066b5: Merge "Remove duplicate local_time.default"
authorYing Wang <wangying@android.com>
Thu, 15 Oct 2015 18:45:35 +0000 (18:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 15 Oct 2015 18:45:35 +0000 (18:45 +0000)
commit7fffc3d0d0ed74c4b5b75a765483c89912089098
treeade289e9bf62c51fa1cca07508a98b8fa599121e
parent31ba99b9e279b588b584ed90cfc1ca9cc04855cd
parent5eb1f1fbf1b62870a0c44088dd8046b7b87239dc
am 5eb1f1fb: am f1b066b5: Merge "Remove duplicate local_time.default"

* commit '5eb1f1fbf1b62870a0c44088dd8046b7b87239dc':
  Remove duplicate local_time.default