OSDN Git Service

am 8f7ac8ca: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Dec 2012 23:48:35 +0000 (15:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Dec 2012 23:48:35 +0000 (15:48 -0800)
commitbb40eab34a5eded59eab171b36cd9667ccf030a3
treefc9a2bfebc358e6fa45c4c218c0ab3e28b154604
parentf9b6e097cba2346c416d4c31dad5549703c963c3
parent8f7ac8caa62326d28a50c9aeb037a805eda661f1
am 8f7ac8ca: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '8f7ac8caa62326d28a50c9aeb037a805eda661f1':
  JDP81