| commit | 904d77118bab63139174470ef728ca9a53e75a15 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Aug 06 22:45:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 06 22:45:23 2014 +0000 |
| tree | dd30bcfe24066fa46bade5643bac51baba337c2b | |
| parent | f365928406ef0a80d3aecc2d025642f9efb80a05 [diff] | |
| parent | 7b561be3a6fedebfce412cecd8c36d6686f6576c [diff] |
am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs * commit '7b561be3a6fedebfce412cecd8c36d6686f6576c': Fix SystemProperties in LayoutLib.