OSDN Git Service

am 68b1d3b0: am 545c8eed: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:57:33 +0000 (10:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 26 Mar 2013 17:57:33 +0000 (10:57 -0700)
commit196aacf2fdea6c9070a2a3a9dc1a9fe43dec48ba
tree6c6d407aabcdea23347b63fe2046c1b7bac52ae8
parent565b5d1b973b587d57222eb0f9a6f2b07623bca3
parent68b1d3b077af7561934a16f3d7e1accf461870cf
am 68b1d3b0: am 545c8eed: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '68b1d3b077af7561934a16f3d7e1accf461870cf':
  JDQ39E
  JDQ39D
  JDQ39C