tree 0b66da4aa575c8e19bb55cb8edfd4dc4e2785742
parent b79d83d34c564d100332cd06bb312d7621c0177c
parent adcd224135e3c12f483547ffa8bb2cb0250ba923
author Deepanshu Gupta <deepanshu@google.com> 1420591523 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420591523 +0000

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

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