tree 24e3fd5f61bd9b981c0bd3d98b464e8f24879405
parent f0de36184bb3ccd4e7d57fdf7795f22f732464e9
parent 4a080dcadd532dd259de596729a1cd6e949bdae4
author Sunny Goyal <sunnygoyal@google.com> 1414099433 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414099433 +0000

am 4a080dca: Merge "Some resource fixes for drop target" into ub-now-queens

* commit '4a080dcadd532dd259de596729a1cd6e949bdae4':
  Some resource fixes for drop target