diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-08-06 22:09:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-06 22:09:13 +0000 |
| commit | 206c691bfdb3a6b78d35c7481365980dd387b8c9 (patch) | |
| tree | c96095716da0bb4930d00a217eea73ae17015bef /docs/html/sdk/api_diff/19/changes | |
| parent | 627439401ec86a083eefdc61728d6aa75ce9a4e5 (diff) | |
| parent | 72cf03a27a73e91d4a3eabf74e0384b310f4a5b2 (diff) | |
am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
* commit '72cf03a27a73e91d4a3eabf74e0384b310f4a5b2':
Fix SystemProperties in LayoutLib.
Diffstat (limited to 'docs/html/sdk/api_diff/19/changes')
0 files changed, 0 insertions, 0 deletions