OSDN Git Service

am 097eaf90: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 30 Nov 2012 23:01:43 +0000 (15:01 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Nov 2012 23:01:43 +0000 (15:01 -0800)
* commit '097eaf9026c0a8d02b1586a2611b5be350c1a285':
  JDP60C


Trivial merge