tree ec1b63fc36dfa57390cd0f5d273c0b2bd6c0d6a1
parent d050df7275137f9c57ce79a7b46d51e2d1fb9290
parent c7fe979303eb924d7fbb9fa342cc5cd7b929c2d2
author Deepanshu Gupta <deepanshu@google.com> 1420583793 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420583793 +0000

am c7fe9793: am 48ab6bec: am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev

* commit 'c7fe979303eb924d7fbb9fa342cc5cd7b929c2d2':
  Make Preference-cookie map non static.