OSDN Git Service

am 231d515e: Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Apr 2013 17:53:15 +0000 (10:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Apr 2013 17:53:15 +0000 (10:53 -0700)
* commit '231d515e861fe83ae12faeb8f3298cd1e332ebab':


Trivial merge