| commit | 79c3f678d21f6b3c058623217cbe5dd57a553fe8 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Aug 06 22:13:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 06 22:13:18 2014 +0000 |
| tree | 3bd1274b7b553dc6fb2f224854c3e29fdc5fd36f | |
| parent | a3966c66ee24109ca4b71f591f0d740ee37987de [diff] | |
| parent | 206c691bfdb3a6b78d35c7481365980dd387b8c9 [diff] |
am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs * commit '206c691bfdb3a6b78d35c7481365980dd387b8c9': Fix SystemProperties in LayoutLib.