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)
commit4c707289ecbf796c309ee6f676ff629b6fac89a7
treeb107110e87d8feab9a71f60a1bafaecc6a3b74cb
parent24fe07c7e3890c18f14b7d93a9f984ba476d10eb
parent09d30981f8e882ffaa336aa4665bfe348557895a
am 09d30981: resolved conflicts for merge of 6f357d32 to master

* commit '09d30981f8e882ffaa336aa4665bfe348557895a':
  Start untangling system server early bootstrapping.