OSDN Git Service

Merge "Remove STOPSHIP" into nyc-dev
authorTodd Kennedy <toddke@google.com>
Tue, 31 May 2016 21:14:37 +0000 (21:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 May 2016 21:14:37 +0000 (21:14 +0000)
commit4fb65090324ff0696e5d38795eaeebf70c72e253
tree0c4a7735f096e2a4098d5e3c324ab897f7e5e457
parent7a845c52834d00035ca92ec46d311aef3cd0835a
parent1c39a112b43e50da4e801d634e28ae7a130c0dcb
Merge "Remove STOPSHIP" into nyc-dev
am: 1c39a112b4

* commit '1c39a112b43e50da4e801d634e28ae7a130c0dcb':
  Remove STOPSHIP

Change-Id: Icc176dca4735f3b03c8e1b47015792ecc202d398
services/core/java/com/android/server/pm/Settings.java