OSDN Git Service

am 9a7768a4: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 18:08:27 +0000 (11:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Aug 2012 18:08:27 +0000 (11:08 -0700)
commitd8c6061a3c671399f8bac9b77a279f547f01cea5
tree638d97d8374ad43338d8ccf7b41c9a3e50bffe98
parent947c0028510cb51b95a2ae84b31e3b06aff2ee85
parent9a7768a4f3fede135ab73098d6a2ae046b5d016b
am 9a7768a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9a7768a4f3fede135ab73098d6a2ae046b5d016b':