OSDN Git Service

am 0ff05c75: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 Aug 2012 22:39:55 +0000 (15:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 Aug 2012 22:39:55 +0000 (15:39 -0700)
commit48d1f7b9410efd4ea731395305b3360c5f5b18d6
treea9e24826a4a1b34da44a9a01299faa6553672985
parent2856d7b8364d3459af51d6be51371285ffca9e38
parent0ff05c75d786ec8d45e4c10888345f24db49fab3
am 0ff05c75: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0ff05c75d786ec8d45e4c10888345f24db49fab3':
  Revert "Added display initialization method"