OSDN Git Service

am 5ea382d2: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Sep 2012 07:32:55 +0000 (00:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Sep 2012 07:32:55 +0000 (00:32 -0700)
* commit '5ea382d2080a5854ac9c8397e27d2b895e520470':


Trivial merge