OSDN Git Service

am 1e442932: (-s ours) am cc71f1ea: am d50926a0: (-s ours) Reconcile with jb-mr0...
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 16:39:52 +0000 (09:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Sep 2012 16:39:52 +0000 (09:39 -0700)
commit0c3f5f70115f726abb73275f426ba704c9c84008
tree0b0ae3d7ceb31ae4fba67223c6b87bb667fd9364
parent30d2deddb192a94f2323f0566fb486b3ade0f9db
parent1e442932f876bacc96147093c2c37074e590519a
am 1e442932: (-s ours) am cc71f1ea: am d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '1e442932f876bacc96147093c2c37074e590519a':
  JZO54H