OSDN Git Service

am a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Sep 2012 16:00:24 +0000 (09:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Sep 2012 16:00:24 +0000 (09:00 -0700)
commit96b17f8e9972cb69e2ae8ce9cb137ecc6ca7763a
treec2e98ffe144c5f5169864118b245b5353fe21cd5
parent0b7e0983d4dab0796fd37439859250c88142463b
parenta8a731bf7fe8d42af56c7481acd99628dd1df2f0
am a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'a8a731bf7fe8d42af56c7481acd99628dd1df2f0':
  JZO54I