OSDN Git Service

am 34d12aaf: Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 21:29:14 +0000 (13:29 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 21:29:14 +0000 (13:29 -0800)
commit43b912989f6cddca820e98ff29dcedf83a89ddde
tree4175e58fbcdd59317ca158991b912bade286d42e
parent5d0f94aa25d5e72fccd3b0d3ed3ecd4855b0e963
parent34d12aaf7ab9162fe891458d45a130e93e9cbc34
am 34d12aaf: Reconcile with jb-mr1-release - do not merge

* commit '34d12aaf7ab9162fe891458d45a130e93e9cbc34':
  JOP37