tree 929bf82084a04d1ec8c5cbb2b52bb46356b38be5
parent 4ef68e4ddd061765c8a89f7cc30af40f0487d308
parent 896eb1c37f6a44d65d3a459891475e99170b657c
author Xavier Ducrohet <xav@google.com> 1457382492 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457382494 +0000

Merge "Change BridgeResources to Resources_Delegate" into nyc-dev