OSDN Git Service

am f09cdd92: (-s ours) am baa97012: am d4c6a2ed: (-s ours) Reconcile with jb-mr0...
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 19:42:16 +0000 (12:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Aug 2012 19:42:16 +0000 (12:42 -0700)
commit796f0ebea3e6be486e9052f78ecaade2a02f26ca
treed8ea7c4afcc18c6a06d90221a8d3bbe4e7e9df57
parent31bd5a89ce0e764e7df361ac2306312bbfa22155
parentf09cdd928d4874f16a72ce79e3f4a0c749a9abc3
am f09cdd92: (-s ours) am baa97012: am d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'f09cdd928d4874f16a72ce79e3f4a0c749a9abc3':
  JZO40