| commit | 0e05841eda1ee3e3568c9ed6088709c0f9cd4f5e | [log] [tgz] |
|---|---|---|
| author | Yigit Boyar <yboyar@google.com> | Fri Mar 27 18:31:06 2015 -0700 |
| committer | Yigit Boyar <yboyar@google.com> | Fri Mar 27 18:32:27 2015 -0700 |
| tree | 149f1a5a7a1a66659489aa3b5a5a0308a564e11e | |
| parent | d573775216408a88e796cd74abf8ab018488c2a3 [diff] | |
| parent | bcb644f8678f15b3f221c5ca6b59e11f410a5065 [diff] |
resolved conflicts for merge of bcb644f8 to lmp-mr1-dev-plus-aosp Change-Id: I3646e59ebdc9f255188d71cbf2528c1945db4e8a