tree 918a7d170487b1dc4522cec12d8ab1eac5dba2a6
parent 8d74abb5bb5cf479f97b26ca8328766dbd6a4257
parent b91bf1f3ced1692b30bd731e6f5555a69ad63d72
author Todd Kennedy <toddke@google.com> 1438125615 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438125615 +0000

am b91bf1f3: am 673fed99: am f2c616ed: Merge "Partially revert package freezing" into mnc-dev

* commit 'b91bf1f3ced1692b30bd731e6f5555a69ad63d72':
  Partially revert package freezing