OSDN Git Service

am fc9e3924: (-s ours) Reconcile with jb-nakasig-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Sep 2012 18:27:46 +0000 (11:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Sep 2012 18:27:46 +0000 (11:27 -0700)
* commit 'fc9e3924a2b9daa55818d7f0b1d819bf171535f5':
  JGO75
  JGO74


Trivial merge