tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent 8d8c77bc21b34506ffef81fda9bd6f6648e17155
parent 55fac8f48dccd580840a6abd2ade76a1e9bd8164
author Ed Tam <etam@google.com> 1479952609 +0000
committer android-build-merger <android-build-merger@google.com> 1479952609 +0000

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

Change-Id: Iaab1f1a421c014f27c81951d0bc37ca9857615e5