OSDN Git Service

am 0ebbd1d4: am d33caa4d: Dream settings now looks for the settings activity in xml.
authorJohn Spurlock <jspurlock@google.com>
Wed, 26 Sep 2012 18:21:55 +0000 (11:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Sep 2012 18:21:55 +0000 (11:21 -0700)
* commit '0ebbd1d44f94ae093378f31b1812c8c45f7cb785':
  Dream settings now looks for the settings activity in xml.


Trivial merge