OSDN Git Service

am e6ce5892: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:13:04 +0000 (10:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Sep 2012 17:13:04 +0000 (10:13 -0700)
* commit 'e6ce589266deddd541fe728a13dc97d661a7c121':


Trivial merge