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