OSDN Git Service

am edf16ad6: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 May 2013 15:10:21 +0000 (08:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 May 2013 15:10:21 +0000 (08:10 -0700)
commitfcd3714fcdb4d0909972abf32d289a940581889b
tree21be0fe72467d9f8394eba3045d76c755523a101
parent259a5a7a88a056ebb7faa2bc5c5745a104edaacc
parentedf16ad654cbebd53ef7be0c585e0f1937340f06
am edf16ad6: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'edf16ad654cbebd53ef7be0c585e0f1937340f06':