Check duplicate layers and extensions am: abf60ccfd2 am: ed1c0a2092
authorMika Isojrvi <misojarvi@google.com>
Wed, 15 Jun 2016 18:09:48 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Jun 2016 18:09:48 +0000 (18:09 +0000)
am: 1e32ac3eab

Change-Id: Ia1c966dc2ea33941c7b92d29a06d75dcf9f52244


Trivial merge