OSDN Git Service

am 09d30981: resolved conflicts for merge of 6f357d32 to master
authorJeff Brown <jeffbrown@google.com>
Thu, 16 Jan 2014 19:47:46 +0000 (11:47 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Jan 2014 19:47:46 +0000 (11:47 -0800)
* commit '09d30981f8e882ffaa336aa4665bfe348557895a':
  Start untangling system server early bootstrapping.


Trivial merge