tree b8bc3dc91513170616163d8507662a29495c8dc1
parent d06e1942abdfceaf85b58a321bd0bc80906dc739
parent 63df3188f5a7e2214f8d1a1594d9465286888702
author Sergey Vasilinets <sergeyv@google.com> 1501701726 +0000
committer android-build-merger <android-build-merger@google.com> 1501701726 +0000

Merge "Fix compilation warnings in Room" into oc-support-26.0-dev am: c4ac41ade3
am: 63df3188f5

Change-Id: I1cf07ba00127e179256e205c09f0cfdbf34d2b05