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