tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent 409f22f726513a96db372c32c1f99608aabc784a
parent 529970a1d61dca77e25057335a2e7bb8c3dc9c11
author Ed Tam <etam@google.com> 1479952483 +0000
committer android-build-merger <android-build-merger@google.com> 1479952483 +0000

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

Change-Id: I6d8637fa42267ff46aef801e1749fc375b9bf324