| commit | bc2fef0b2a065aafacebe69bae53bd0e0fb9ef67 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Aug 07 00:04:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 07 00:04:55 2014 +0000 |
| tree | 10f8f76142f1f09d1d2f1c5d46a3898df00b08f2 | |
| parent | b1de5a59be3f9e850f3ea3802f75ce57c5cfae01 [diff] | |
| parent | 4e01c59e6c0d953c40153afc080c01d844f76aef [diff] |
am 4e01c59e: (-s ours) am 6ebeefa0: am 904d7711: 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 '4e01c59e6c0d953c40153afc080c01d844f76aef': Fix SystemProperties in LayoutLib.