OSDN Git Service

am 2e939805: Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Nov 2012 15:28:31 +0000 (07:28 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 15:28:31 +0000 (07:28 -0800)
commitdaa3e04e485a037b38ff0d97a04fb1e0d139b143
tree52610baba474df56aca468336f7da3b89a91b645
parent976a70c41ec0dd6f283c1bec8b2c0c15deb373c0
parent2e939805afafebced02bc3ed027807291ddd5dc4
am 2e939805: Reconcile with jb-mr1-release - do not merge

* commit '2e939805afafebced02bc3ed027807291ddd5dc4':
  JOP40C
  JOP40B