tree c47ccebd553978f94e8299d9f9fc752ff58a8816
parent c9ad35ce397457729f2aa7c46fb1f07e33405ffc
parent e2c0901918d46d6e9920c71436bc1f896cbd425b
author Yang Ni <yangni@google.com> 1493741499 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1493741500 +0000

Merge "Do not package res unless RS target API < 21" into oc-dev