tree fdd95af92779676d74c0b20470568c1c5b3fba34
parent 94878c3099fc2c8e50608b3083936417b6e4f7ce
parent e30d79650b475aefbb5cef576032ac2b5250c2ca
author Ed Tam <etam@google.com> 1479952772 +0000
committer android-build-merger <android-build-merger@google.com> 1479952772 +0000

Merge "Fix RecyclerView resource path am: 43d0156 am: a6fb1e6" into nyc-mr1-dev-plus-aosp am: 529970a1d6 am: 55fac8f48d
am: e30d79650b

Change-Id: Ie5c7eaa5225266bff0f63f1a47f0ce6f18dce6ca