OSDN Git Service

am 0afc1f60: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 16:12:15 +0000 (09:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Sep 2012 16:12:15 +0000 (09:12 -0700)
commit57a8fa0d564257f5bfe55558f30e0e59655d5414
treeb479405e32012ceefec3f433e6d45745492bd6ce
parent9d2334a3913707944fe120f1f317e0955c897f95
parent0afc1f60b1374feb36012c9248adead192a7f081
am 0afc1f60: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0afc1f60b1374feb36012c9248adead192a7f081':