tree f89dce2c55144d803eb4f892f539dc37730a245a
parent c90a01ca6a64a7c3cea5f51d25632dd80caf0b75
parent 529970a1d61dca77e25057335a2e7bb8c3dc9c11
author Ed Tam <etam@google.com> 1461047970 +0000
committer android-build-merger <android-build-merger@google.com> 1461047970 +0000

Merge "Fix RecyclerView resource path am: 43d0156 am: a6fb1e6" into nyc-mr1-dev-plus-aosp
am: 529970a

* commit '529970a1d61dca77e25057335a2e7bb8c3dc9c11':

Change-Id: I7e30a23b3423617926b885682bb461f0d4d591d9