OSDN Git Service

am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 20:54:20 +0000 (20:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 20:54:20 +0000 (20:54 +0000)
commit9f5f450dca41bcea94b2abae1c782a84c0387f6d
tree80a3b4c13ba476ff76c868ae4d709c3280b7422d
parent48931fcc0d7f6d82011414ffc234a52a1cce11a4
parente5c518cbd0544a44bae8cb2a0b90d18bb91c5b8a
am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev

* commit 'e5c518cbd0544a44bae8cb2a0b90d18bb91c5b8a':
  Add view cookies for action bar menus. [DO NOT MERGE]