| commit | e5c518cbd0544a44bae8cb2a0b90d18bb91c5b8a | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 20:49:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 20:49:06 2014 +0000 |
| tree | 4195fe073e43573b74f591dea381eba78f4ea4dd | |
| parent | a312214f736638486983874b4f266bb537bab723 [diff] | |
| parent | 4e8b055b2ad23f6e336872f775058bcf18c46dfd [diff] |
am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev * commit '4e8b055b2ad23f6e336872f775058bcf18c46dfd': Add view cookies for action bar menus. [DO NOT MERGE]