OSDN Git Service

Merge changes from topic "b_78809704" into pi-dev
authorTodd Kennedy <toddke@google.com>
Fri, 11 May 2018 17:44:53 +0000 (17:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 May 2018 17:44:53 +0000 (17:44 +0000)
commit92b64bb1bbabcc2908fe510e71b4a60426ca3cb0
tree28889555714f248aed622010d4fba9a723841867
parent92a339736f5ef8cd86c6b022f1dcacc96d0b81c7
parenta525e2239a95c79d62e27b18fc5e4f13789ab352
Merge changes from topic "b_78809704" into pi-dev

* changes:
  OMS: teach the OMS about static RROs
  OMS: rebase settings when overlays update
core/java/android/content/om/OverlayInfo.java
services/core/java/com/android/server/om/OverlayManagerServiceImpl.java