OSDN Git Service

am d9c2de10: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 18:04:10 +0000 (11:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Aug 2012 18:04:10 +0000 (11:04 -0700)
* commit 'd9c2de10d94b1c46e0e3dee41bd6d8de673d2267':


Trivial merge