tree e98a11812008c753ac2e01e84f3301967532d221
parent b0cba16a6d2d901682ee44f99d7196fcf6888357
parent fd14e2425fc0d1efa1295d1dbf6b0d1b058730b4
author The Android Open Source Project <initial-contribution@android.com> 1347750574 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347750574 -0700

am fd14e242: (-s ours) Reconcile with jb-nakasig-release - do not merge

* commit 'fd14e2425fc0d1efa1295d1dbf6b0d1b058730b4':
  JGO77
  JGO76