OSDN Git Service

am 2dff5b10: Merge "New dream settings - first cut" into jb-mr1-dev
authorJohn Spurlock <jspurlock@google.com>
Wed, 29 Aug 2012 22:57:54 +0000 (15:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Aug 2012 22:57:54 +0000 (15:57 -0700)
* commit '2dff5b109b9dd4b55cb64d89ff55c56318052b5c':
  New dream settings - first cut


Trivial merge