OSDN Git Service

am 17b0879f: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 15:46:35 +0000 (07:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 Nov 2012 15:46:35 +0000 (07:46 -0800)
* commit '17b0879f5c4ea61e49dd17756786d762dd603a72':


Trivial merge