OSDN Git Service

resolve merge conflicts of 718f321 to nyc-mr1-dev
authorAmith Yamasani <yamasani@google.com>
Wed, 8 Jun 2016 18:40:55 +0000 (11:40 -0700)
committerAmith Yamasani <yamasani@google.com>
Wed, 8 Jun 2016 18:43:46 +0000 (18:43 +0000)
commit211b5b10f6baddc290f7f65c0ac70eed3b9913c8
tree6cf3bafcdbbb7ff2a0e26bb8d662e725742ab498
parentebfa28ccf8abe0bb512a307f187874bdc5e7f00f
parent718f321369cc9b7fde264b29c05f9dc0fc53c7b7
resolve merge conflicts of 718f321 to nyc-mr1-dev

Change-Id: I0021aa5be1822082d8ff026cafa8c8b6b56b90b5
api/system-current.txt
core/res/AndroidManifest.xml
services/core/java/com/android/server/PersistentDataBlockService.java