OSDN Git Service

am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221b...
authorDeepanshu Gupta <deepanshu@google.com>
Fri, 26 Sep 2014 05:13:09 +0000 (05:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Sep 2014 05:13:09 +0000 (05:13 +0000)
* commit 'ee41b79c5735bb3399108bb62de1145fffff3904':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]


Trivial merge