tree e395d9177a329782dd5be2a5ec228b1abe3093a2
parent c0707c007d8322338e9f46f5ccb04b5582e75845
parent 503071ae41374a66f61e53e05a91243473db83b9
author Adam Lesinski <adamlesinski@google.com> 1417684905 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417684905 +0000

am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays"

* commit '503071ae41374a66f61e53e05a91243473db83b9':
  RRO: prevent duplicate system overlays