| commit | 9f38adc4daa3c6d887ddce98ea9953f4804cba5c | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@google.com> | Mon Dec 02 23:07:59 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 02 23:07:59 2013 +0000 |
| tree | d702ac255ec8490c66801f303c6ee205199705bf | |
| parent | 5a2ed23cbf54b2455a519b60112691e9d59ed8fa [diff] | |
| parent | 1d3205f62a75b92cda1b10f3151234741e4e708b [diff] |
am 1d3205f6: (-s ours) am b6f3708d: am 1044a1dc: Merge "Update delegate methods in layoutlib." into klp-dev * commit '1d3205f62a75b92cda1b10f3151234741e4e708b': Update delegate methods in layoutlib.