| commit | 3038addf3e293cd77cc982ff345fd295043e206d | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Aug 06 22:21:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 06 22:21:54 2014 +0000 |
| tree | c94671cba4c5d90507c519abc74b15af8e62a198 | |
| parent | dc5b12a93be69a4c713b3a6fd686bd7b31b5778f [diff] | |
| parent | ebf8b7b94709cf830c900b5cf11aa427e1d3317b [diff] |
am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs * commit 'f970d2c201649843b8d51d094b865f16b15bc0bc': Fix SystemProperties in LayoutLib.