OSDN Git Service

am 5a051a7f: Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 21:29:17 +0000 (13:29 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 21:29:17 +0000 (13:29 -0800)
commita60f3ae723844f72cf81ee442b3a9babf793f731
tree2462e169462e77e4ef545e0a1d86e75a14db3fa5
parentb19c4ced11debd52313d9bfcb3b66dabba84b5b1
parent5a051a7f0af2e206afd8c1e765eb80690345a536
am 5a051a7f: Reconcile with jb-mr1-release - do not merge

* commit '5a051a7f0af2e206afd8c1e765eb80690345a536':