tree fa5ab13e50deb27c579a0bf6c346aab5939058fc
parent e5856bca980d8e7678ae434ccfbb75d5093a7e0f
parent 3dcea047c5c7a61a56f618815e298d7bd38e2678
author Android (Google) Code Review <android-gerrit@google.com> 1245166595 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1245166595 -0700

am 3dcea047: Merge change 4237 into donut

Merge commit '3dcea047c5c7a61a56f618815e298d7bd38e2678'

* commit '3dcea047c5c7a61a56f618815e298d7bd38e2678':
  Remove obsolete FOTA_UPDATE permission (which should never have been