| commit | b94ed50a53ecbfbd360a2771a22ec91283b9a5f3 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Wed Jul 23 14:28:26 2014 -0700 |
| committer | Mathieu Chartier <mathieuc@google.com> | Wed Jul 23 14:28:26 2014 -0700 |
| tree | 6787bd2fe33fc94fbfc4896e444a0c277eb55446 | |
| parent | f4afc70f8b31867587e12772465bb09489c3cebb [diff] | |
| parent | 38c488bcd41ba632a646d7a1d790ec71a2fcf6fa [diff] |
resolved conflicts for merge of 38c488bc to lmp-dev-plus-aosp Change-Id: If8fbbd51232fd01a481cb47df426de169c0c830c