| commit | 1ff5ad874ef8ad9e9e02cddfe35f793d0c15c47b | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Oct 04 11:08:03 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 04 11:08:03 2013 -0700 |
| tree | 5e9f3aa80d784864df1f7cf9a5b03cf32eb4b97d | |
| parent | 1461e26674d73e9ad7d7896c59c936a2f88af3f4 [diff] | |
| parent | 2c64e2be0cf2e1fa537a0c0d353f3a8c9d5852d4 [diff] |
am 2c64e2be: (-s ours) am 70cd6886: am fb45a2e9: Merge "Fix layoutlib build" into klp-dev * commit '2c64e2be0cf2e1fa537a0c0d353f3a8c9d5852d4': Fix layoutlib build