commit | 8c686ddd540f3a15cdba4893f104c0e8e9af5716 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Mon Jan 05 23:33:02 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 05 23:33:02 2015 +0000 |
tree | 3478676c427f8a18163b32662836653a277fd4fa | |
parent | cec8e5a10de413c733223b8b1cc11b70c6254647 [diff] | |
parent | d20a518c82e5e33d33e3dc5d74bf3c17d807f7d7 [diff] |
am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev * commit 'd20a518c82e5e33d33e3dc5d74bf3c17d807f7d7': Make Preference-cookie map non static.