| commit | d1616d2c3729417427837a0026875d6d9595c8f6 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Jun 18 19:50:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 18 19:50:26 2014 +0000 |
| tree | 328d8fde17e716c0b55e208aa3bc05727bf365c0 | |
| parent | 53ca6fe25ec5e92e8701b1102cec940db82d9dda [diff] | |
| parent | 8402b73b4a73cdf31484256fbc24d3659d6d5f97 [diff] |
am 8402b73b: resolved conflicts for merge of 84faec58 to klp-modular-dev * commit '8402b73b4a73cdf31484256fbc24d3659d6d5f97': Use a single build tools version for frameworks/support.