OSDN Git Service

am 29aab7a2: Fixed a Settings crash.
authorPauloftheWest <paulofthewest@google.com>
Wed, 1 Oct 2014 14:58:41 +0000 (14:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Oct 2014 14:58:41 +0000 (14:58 +0000)
* commit '29aab7a2ad3cabdc1681fdc93a0f00b20072d385':
  Fixed a Settings crash.


Trivial merge