OSDN Git Service

am d2c65351: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:32:39 +0000 (08:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Aug 2012 15:32:39 +0000 (08:32 -0700)
commit2788887b2363be0f12b43ab2c6fa8c31906876d3
tree0c4c9281a73adfe829a50709b118b577b429c3b1
parent19f0e138d0e7f4f1233db4086f04214fd288d919
parentd2c653514cd77fc8ce73c4da40ac9e2a9d4a74f5
am d2c65351: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd2c653514cd77fc8ce73c4da40ac9e2a9d4a74f5':