OSDN Git Service

am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 21:02:14 +0000 (21:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 21:02:14 +0000 (21:02 +0000)
commitb7e1bef1835bdb224d6ed09c3c219662e1db1f56
tree4195fe073e43573b74f591dea381eba78f4ea4dd
parent22dabb52820d81744f46d009a27bf9294928bbee
parentb607cb82e0883a755fa6c6f9f5ec573cd79a731b
am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev

* commit 'b607cb82e0883a755fa6c6f9f5ec573cd79a731b':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]