| commit | 32ce52b01dab863f2b4749e1c69f619cf820486f | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Mar 24 19:36:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 24 19:36:36 2014 +0000 |
| tree | 489e255200d3a7bfdac8269bee29a9b55707f14e | |
| parent | f555c47f1843b5a3557e18c16cb06b0ec06dcf34 [diff] | |
| parent | 5c679d41714e42f153f6aeb492df54510a195bc1 [diff] |
am 5c679d41: resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp * commit '5c679d41714e42f153f6aeb492df54510a195bc1': libcameraservice: build 64-bit libcameraservice: fix 64-bit print format warnings