| commit | 7f45b2e9402ce2b18594f750c073c01a3adbc1e5 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Wed Mar 28 11:40:06 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 28 11:40:06 2012 -0700 |
| tree | ce07c2d8bb79c1c5a8cb9f3dc4a03b65e8b354e1 | |
| parent | 314dea12dfec428d9e832ab10a52e75dea1a130e [diff] | |
| parent | 3f6250907c3dd53830e34d54200bbd94845f1f31 [diff] |
am 3f625090: am 75d9cabc: resolved conflicts for merge of fe2da416 to stage-aosp-master * commit '3f6250907c3dd53830e34d54200bbd94845f1f31': Merge SDK support for source.properties templates.