OSDN Git Service

Reconcile with jb-mr0-release jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Jul 2012 21:49:57 +0000 (14:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Jul 2012 21:49:58 +0000 (14:49 -0700)
commit024e9ab796609334a209062d449ddb4a73eb925e
tree9e290322e8709157cd2b47ed597234fee0fae5a1
parentab81700ce9db23b338a9d75884425b047875b031
parente2b8f8649c2aeb54e1565f8632fc0c348730fc01
parent5be30d0974289f039ea28d2b708781a7665b0730
Reconcile with jb-mr0-release jb-release

Change-Id: I8b44c9fafc5d0a2c0d6ad959c5e2ed0ae02b3f54