OSDN Git Service

am 20d8abc6: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:28:57 +0000 (13:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Aug 2012 20:28:57 +0000 (13:28 -0700)
commit01f4ede7766682cd4def4b61ae07e60efecfe64b
tree777581a1ec50c30ce78a03d911b51f42dac0f8ad
parentb44a7a0d4f72bf482e6f3f95d2027feb46ad61fa
parent20d8abc638df1dba3c9dc95601aabed200a5abd1
am 20d8abc6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '20d8abc638df1dba3c9dc95601aabed200a5abd1':