OSDN Git Service

am 600a7278: (-s ours) am c0aec062: am 930540de: Reconcile with jb-mr1-factory-releas...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:29:09 +0000 (12:29 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 20:29:09 +0000 (12:29 -0800)
commita7d14de363019ce540e668357a9e8d2a11b08a49
tree5862b78d667371e87353d024d877a07edf11fa94
parentb1cfada58a7a259e527e025b2b69806ef8121a57
parent600a72784d7e928167ad0865d6ef2b2fd62a31db
am 600a7278: (-s ours) am c0aec062: am 930540de: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '600a72784d7e928167ad0865d6ef2b2fd62a31db':