OSDN Git Service

am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error...
authorDeepanshu Gupta <deepanshu@google.com>
Fri, 26 Sep 2014 04:57:59 +0000 (04:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Sep 2014 04:57:59 +0000 (04:57 +0000)
commitee41b79c5735bb3399108bb62de1145fffff3904
treedac7e7f8dd90e6f995f4ac41339603d09d0c2351
parent08523e680e1ec1e4ec521c7e732e60fd85f553a4
parent7d23e405bd3a18f871bcf9856b5a9bcc0ccb1236
am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]

* commit '7d23e405bd3a18f871bcf9856b5a9bcc0ccb1236':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]