OSDN Git Service

am 75fc74d6: am 203964c0: am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolve...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 21:17:57 +0000 (21:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 21:17:57 +0000 (21:17 +0000)
commit2322a9107b63928529c29cabc719575692d5d934
tree22561947d0d13aef1956e26547711de6cce4fa7b
parenteb5b38b167dd5f094acc085ede494966ed0024c5
parent75fc74d6dbc06872d13d0db0300b530dc90bdb01
am 75fc74d6: am 203964c0: am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev

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