OSDN Git Service

am 7dcd20f9: resolved conflicts for merge of 162b014c to klp-dev-plus-aosp
authorAmith Yamasani <yamasani@google.com>
Tue, 24 Sep 2013 22:05:02 +0000 (15:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Sep 2013 22:05:02 +0000 (15:05 -0700)
commit7c84c7f4220d87dab5518cfb541df9583661de71
treece229ab9442eadbde3f28538cf1f41552eb174d4
parent2a9ea16846e4275bfe3136f88b0542a3182bdb61
parent7dcd20f9a6877342a92d0e42c1692a25429960f5
am 7dcd20f9: resolved conflicts for merge of 162b014c to klp-dev-plus-aosp

* commit '7dcd20f9a6877342a92d0e42c1692a25429960f5':
  Add Jakarta timezone