| commit | 3271adea10a7a35d4fe852801794038f01e371be | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 17:02:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 17:02:20 2014 +0000 |
| tree | 4c80745ebc16bb61288714196133a7fad6708f9b | |
| parent | 663a1c7484b7df5134712149d59a9863980c4470 [diff] | |
| parent | 6b0c427670606abf5539789299042dc04c67703e [diff] |
am 6b0c4276: am dff29f73: am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev * commit '6b0c427670606abf5539789299042dc04c67703e': Fix layoutlib [DO NOT MERGE]