tree d4a63c063d76ad9d994145ebbb26b1fafba3e072
parent ef728d42927f127fe8d1fc075aef312892388901
parent 0e375f947b698ac6d5bd294968d0cda3003a6f28
author Sunny Goyal <sunnygoyal@google.com> 1414096146 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414096146 +0000

Merge "Some resource fixes for drop target" into ub-now-queens