OSDN Git Service

am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 21:07:35 +0000 (21:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 21:07:35 +0000 (21:07 +0000)
commit203964c058857d01401c905918d0d64e83e51bab
tree80a3b4c13ba476ff76c868ae4d709c3280b7422d
parent0eb268a0de02b73dd23ab2e672c35a2650a9eea4
parentb7e1bef1835bdb224d6ed09c3c219662e1db1f56
am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev

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