commit | 48ab6becea828c0bcaaf79fe930aac31881f59db | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Tue Jan 06 22:22:44 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 06 22:22:44 2015 +0000 |
tree | 0ce96b9e4c5d1759818bb982219bd85bdbe32d77 | |
parent | b88a65df73798becc57004b3fc55fdf8c0a83a13 [diff] | |
parent | 8c686ddd540f3a15cdba4893f104c0e8e9af5716 [diff] |
am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev * commit '8c686ddd540f3a15cdba4893f104c0e8e9af5716': Make Preference-cookie map non static.