| commit | 18dbb0a52a3f48536b9444228e8b45763ec66632 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Tue Nov 05 13:26:33 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 05 13:26:33 2013 -0800 |
| tree | 8937491a789ef1442cd52ce0dca4f0267b464053 | |
| parent | 7e3fa615c56d017936f105c3dabe997bded76066 [diff] | |
| parent | a2a5de35c38613e60d0df784c9dcd7f08e6e463e [diff] |
am a2a5de35: resolved conflicts for merge of 3ef2b0f3 to klp-ub-dev * commit 'a2a5de35c38613e60d0df784c9dcd7f08e6e463e':