| commit | da9cc77339b18e3624efe99684a4d1511a02a8f9 | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Thu Jul 24 14:21:52 2014 -0700 |
| committer | Tim Murray <timmurray@google.com> | Thu Jul 24 14:21:52 2014 -0700 |
| tree | 0d1d609bd9c2992621ddb626c5c1314799578100 | |
| parent | 5a289ed29345e545742bc33728d7010b5e2c1e65 [diff] | |
| parent | 159474f2ae5d13308ca1b92b8a5ccd809ec6a450 [diff] |
resolved conflicts for merge of 159474f2 to lmp-dev-plus-aosp Change-Id: Ie133ba3e80132d711796d0de6c5ae611f7e43365