tree 1a5b93a38bd65b35e4638360029421af4dafb141
parent 36e4e050ff52956fc4afe60c156e81c2016304c4
parent e581d866fb66fde65f63bbce4bd255400fa1bdb7
author Keun young Park <keunyoung@google.com> 1338435029 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1338435029 -0700

Merge "change location of apns-conf.xml and vold.conf" into jb-dev