tree 8e115c1cee78dc66dd784cbb0a36bf4b704ed27c
parent 8c08fc27bba86f92773a5bcb0a14e8e4e03e5de1
parent e88d14a8b8101248ce0a3b3b00993fd1393f6be2
author John Spurlock <jspurlock@google.com> 1383706618 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383706618 -0800

am e88d14a8: am 9d383ece: Merge "Fix recent regression in DrawableContainer." into klp-dev

* commit 'e88d14a8b8101248ce0a3b3b00993fd1393f6be2':
  Fix recent regression in DrawableContainer.