| commit | 0cbfde12fde85713f87d8c5ac0cc137c143dfd27 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 16:41:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 16:41:50 2014 +0000 |
| tree | ebf705c2593bc4342fddaadb8804a0364d3e2384 | |
| parent | b5b4d6eb790ec344680f92f75edd75c427058266 [diff] | |
| parent | 40b54563743c3bab92ee7086f8a2b159ecef5453 [diff] |
am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev * commit '40b54563743c3bab92ee7086f8a2b159ecef5453': Fix layoutlib [DO NOT MERGE]