| commit | 72cf03a27a73e91d4a3eabf74e0384b310f4a5b2 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Aug 06 22:05:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 06 22:05:38 2014 +0000 |
| tree | daedb43ca33e5c9cf2aebc4cf0fff80019530247 | |
| parent | 8c71ff298b10ebdd3e5dec6f69f70176161b7e0a [diff] | |
| parent | 3a544a81b3d2d529b2995f4b5db2077760d440b5 [diff] |
am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs * commit '3a544a81b3d2d529b2995f4b5db2077760d440b5': Fix SystemProperties in LayoutLib.