summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib
diff options
context:
space:
mode:
authorTodd Kennedy <toddke@google.com>2015-07-28 23:20:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-28 23:20:15 +0000
commit4c423351c0713e8255e32fa0feb7b606fe0c8278 (patch)
tree918a7d170487b1dc4522cec12d8ab1eac5dba2a6 /packages/SettingsLib
parent8d74abb5bb5cf479f97b26ca8328766dbd6a4257 (diff)
parentb91bf1f3ced1692b30bd731e6f5555a69ad63d72 (diff)
downloadframeworks_base-4c423351c0713e8255e32fa0feb7b606fe0c8278.zip
frameworks_base-4c423351c0713e8255e32fa0feb7b606fe0c8278.tar.gz
frameworks_base-4c423351c0713e8255e32fa0feb7b606fe0c8278.tar.bz2
am b91bf1f3: am 673fed99: am f2c616ed: Merge "Partially revert package freezing" into mnc-dev
* commit 'b91bf1f3ced1692b30bd731e6f5555a69ad63d72': Partially revert package freezing
Diffstat (limited to 'packages/SettingsLib')
0 files changed, 0 insertions, 0 deletions