| commit | 184e3ed0f094ecb6cb8130a135ba8a8e9e51803a | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Mon Sep 29 15:04:06 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Mon Sep 29 15:10:23 2014 -0700 |
| tree | a553e248c78609f285355b02bc4614a060c44208 | |
| parent | ce636cccdaef0015ba6fff313ae72bdc3478558e [diff] | |
| parent | 6290c048e1679ae6c814a5e1b2efa4456f9bfb97 [diff] |
resolved conflicts for merge of 6290c048 to lmp-mr1-dev-plus-aosp Change-Id: I2551a233079c2be562ba37dc7413d59ce4e7bf83