OSDN Git Service

am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:28:12 +0000 (12:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:28:12 +0000 (12:28 -0700)
commit42b4c5083b168c6780b95e5c60b49655b049d56f
tree37c86da3588552d23f3a8678e9e6bcb2b541c583
parentd67cc366f769a84f56755b12d2c943113ec46f8c
parent11ff695d526735306e1868b596212aac9f3239f4
am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '11ff695d526735306e1868b596212aac9f3239f4':