| commit | 6f2b61441854c1a1d10ea7c7e8ef14f7403a46dc | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Wed May 21 00:01:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 21 00:01:29 2014 +0000 |
| tree | e20336a8f6e15ddefe2f940f6227077f621d41a0 | |
| parent | e657db091be36fce60b925b447b949caad623967 [diff] | |
| parent | f786331925d50c2235f298e39880a9a05670b0dd [diff] |
am f7863319: am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master * commit 'f786331925d50c2235f298e39880a9a05670b0dd': Fix SDK build.