OSDN Git Service

am 23f4673d: (-s ours) am 711d2c79: Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:14:06 +0000 (10:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Apr 2013 17:14:06 +0000 (10:14 -0700)
commit20d9c109bd30da403a85cbb12364c8b1214c3358
tree6735b88ad487a353d77efaf43b647cb83123a439
parent57fcadd0cbe8f1fe15c4b06eeeee558471edd6d6
parentb19e7704e8644a803b0de568a3d2cd513e188e40
am 23f4673d: (-s ours) am 711d2c79: Reconcile with jb-mr2-release - do not merge

* commit '23f4673d3de46215cf748a20a8b28adf83003a35':