| commit | 7e3fa615c56d017936f105c3dabe997bded76066 | [log] [tgz] |
|---|---|---|
| author | quddusc <quddusc@google.com> | Tue Nov 05 13:26:32 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 05 13:26:32 2013 -0800 |
| tree | 8937491a789ef1442cd52ce0dca4f0267b464053 | |
| parent | ff6257f11017c4dc185fc0b285f554bc0b7f4e8c [diff] | |
| parent | 4e4303c993ef50d45e5d6b783d9c127b4d3857b1 [diff] |
am 4e4303c9: (-s ours) resolved conflicts for merge of 3943cdc9 to klp-ub-dev * commit '4e4303c993ef50d45e5d6b783d9c127b4d3857b1':