OSDN Git Service

am b30d81d1: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 21:07:22 +0000 (14:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Jun 2013 21:07:22 +0000 (14:07 -0700)
commit2a131742f7dfb5ecec677e4d405293df90bd7f04
treed1e8163ef7fa9603d6a953e0270e3e4fcc027805
parentbed7bada875c7e7badebd07368d73edd83b6b423
parentb30d81d1dc265b0a1e59d92c996ab9734d272674
am b30d81d1: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'b30d81d1dc265b0a1e59d92c996ab9734d272674':