diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-08-06 22:13:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-06 22:13:18 +0000 |
| commit | 79c3f678d21f6b3c058623217cbe5dd57a553fe8 (patch) | |
| tree | 3bd1274b7b553dc6fb2f224854c3e29fdc5fd36f /docs/html/sdk/api_diff/19/changes | |
| 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.
Diffstat (limited to 'docs/html/sdk/api_diff/19/changes')
0 files changed, 0 insertions, 0 deletions