OSDN Git Service

am 57c97328: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:18:35 +0000 (07:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 25 Aug 2012 14:18:35 +0000 (07:18 -0700)
commit9e8204ef2ffea33da974761405fd4ea776bd3e90
tree644cbaca62e7d4ce522c5ed6ada121527f1ae7f6
parentb2ac46ac1307e762c331e2b36455945a8ccf371a
parenteec04bf25d16632633e8ba5c6830e7c77175584b
am 57c97328: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '57c973282c38480c6eb910d239938b27ee5562af':