tree 4bb37c053311f946ca70c993bc0080af9c8ab936
parent 6d4cf9512d2bf439176826cfc5fd78dcf93836fe
parent 97db93b6bd81b5e647aeb40d9ccdf4a59771d18e
author Dake Gu <dake@google.com> 1436387111 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436387112 +0000

Merge "fix build: add missing resource" into lmp-mr1-ub-dev