OSDN Git Service

am 53ba6b22: am 15d15136: Merge "change location of apns-conf.xml and vold.conf"...
authorKeun young Park <keunyoung@google.com>
Thu, 31 May 2012 03:36:08 +0000 (20:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 31 May 2012 03:36:08 +0000 (20:36 -0700)
commit49004e38fb1489cea1fbcbb94efbaca70ac8db46
tree32e9d01aa2da7e91c17d9a69a64a99f134baab9c
parentca7d27212e89ee6d890e3e6017679468fd82b3b5
parent53ba6b22f94c1192541b11ada001b68823b97efa
am 53ba6b22: am 15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev

* commit '53ba6b22f94c1192541b11ada001b68823b97efa':
  change location of apns-conf.xml and vold.conf