| commit | 6c57fc30198e8f3a2756aab6bc832450391eec94 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Jul 16 10:23:28 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Wed Jul 16 10:23:28 2014 -0700 |
| tree | ac071fc0610bbfcab22ce9c42aff209abbde69e4 | |
| parent | c8fcb3bcdb71fe16624bea146a67b13c150adb82 [diff] |
DO NOT MERGE - Fix LayoutLib. This fixes a bad merge and contains partial cherrypicks of the following commits to make LayoutLib working again: 103d40960daa0420995aa12881bef33892a0a2ab 803d77d8904a8fd66f0370cca6ed7f8b7cf68907 6a08225cee197e5baf80dd06dae46988db284122 Bug: 15987446 Change-Id: I41563305206d30ecdbc7f609c4b90d53edb42689