OSDN Git Service

am 797f3c48: am 8069392f: am dc4818ab: Merge "Bring back auto-rotate to settings...
authorJason Monk <jmonk@google.com>
Wed, 3 Sep 2014 05:02:54 +0000 (05:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Sep 2014 05:02:54 +0000 (05:02 +0000)
* commit '797f3c48532fdec5b692342a5554330755ba4778':
  Bring back auto-rotate to settings

1  2 
res/values/strings.xml

Simple merge