| commit | 11243dd66484d0f99f56454491d5d82acfca6070 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 20:59:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 20:59:25 2014 +0000 |
| tree | 1ce19922396c657ebbc4d4da545cfa976999429d | |
| parent | 9d3ec0be302acf9f29d0fb2be644841d71ed5e63 [diff] | |
| parent | 9f5f450dca41bcea94b2abae1c782a84c0387f6d [diff] |
am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev * commit '9f5f450dca41bcea94b2abae1c782a84c0387f6d': Add view cookies for action bar menus. [DO NOT MERGE]