| commit | 83dfaa8853fd485bc5d4307c282b093f6e140f1e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Oct 18 17:59:55 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 18 17:59:55 2013 -0700 |
| tree | a6a169350152696cff8a2d1302b2f806992294d4 | |
| parent | 7d0c73cb8dda620a17503911726a3a01356eb39d [diff] | |
| parent | 37cc29e95684de126693f59e91703b2af57e7659 [diff] |
am 37cc29e9: resolved conflicts for merge of 9ff588f8 to klp-dev-plus-aosp * commit '37cc29e95684de126693f59e91703b2af57e7659': Use %zd for size_t.