OSDN Git Service

am dd66f462: (-s ours) am 69bb4e42: am 564c2b3e: Reconcile with jb-mr1.1-release...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 5 Mar 2013 01:02:38 +0000 (01:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Mar 2013 01:02:38 +0000 (01:02 +0000)
commit535ebd01bf5bb0955b1d4f6fb56e2ef691fbeab8
tree96e61436622122b03a2a406b04770bb4b245342b
parentf08e8eb2a338d114be3e94ceedf5d845e971895b
parentdd66f462fd65d3f4caccf3b54b1e3efd548feaf6
am dd66f462: (-s ours) am 69bb4e42: am 564c2b3e: Reconcile with jb-mr1.1-release - do not merge

* commit 'dd66f462fd65d3f4caccf3b54b1e3efd548feaf6':
  JDQ39B