| commit | 8114da7b9fb93561985016d518ff23b542ac0bde | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Jul 25 15:44:02 2014 -0700 |
| committer | Alex Klyubin <klyubin@google.com> | Fri Jul 25 15:49:35 2014 -0700 |
| tree | 796b109e587f160ca892a1fea5292d6eb564b0b0 | |
| parent | 4d73cf3c34361e384c154ed8ae709a42aadbd9fe [diff] | |
| parent | 590e76dd7af7b9166d0fc6673d332cac39ab9f9f [diff] |
resolved conflicts for merge of 590e76dd to jb-mr1-dev-plus-aosp Change-Id: I50ce5fdaf05829b51e5353671226d1dd73d831e9