OSDN Git Service

am 328acffd: (-s ours) am 2e8ba1c1: am 8ff6cb60: DO NOT MERGE
authorMichael Jurka <mikejurka@google.com>
Fri, 13 May 2011 23:03:36 +0000 (16:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 May 2011 23:03:36 +0000 (16:03 -0700)
commit8156369570c0fba75c5541d40fb06f85b70b33b1
tree537fb76a51d7be08e730837ea581d9db40ac5ee9
parent3c879634167bf91fa370c19983f9b4853837c3ce
parent328acffd8b2ba73693da76ce85581661db45c5aa
am 328acffd: (-s ours) am 2e8ba1c1: am 8ff6cb60: DO NOT MERGE

* commit '328acffd8b2ba73693da76ce85581661db45c5aa':
  DO NOT MERGE