| commit | 6dad59e146dc16a2386124a5cd3b28411c024c4f | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 20:38:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 20:38:12 2014 +0000 |
| tree | 4971c055148fd81e01ff182264bc553e5bae6b48 | |
| parent | ccf6b34799efb14e5883ed4901ff03bf75ac4c1c [diff] | |
| parent | 85b751949b3d383494523bb98b016157d76787f3 [diff] |
am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev * commit '85b751949b3d383494523bb98b016157d76787f3': Add view cookies for action bar menus. [DO NOT MERGE]