OSDN Git Service

am 0d94b210: resolved conflicts for merge of 71c8cbb7 to master
authorRay Chen <raychen@google.com>
Wed, 19 Oct 2011 17:21:44 +0000 (10:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Oct 2011 17:21:44 +0000 (10:21 -0700)
* commit '0d94b210dfee1376a11aa53d07a7051a8c181787':
  Fix 5213252 [UI] Updated action bar layouts and action orders


Trivial merge