| commit | 371d77ecf684163b3bd1061e00191980f1fc90a1 | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Thu Jan 08 10:46:53 2015 +0000 |
| committer | Vladimir Marko <vmarko@google.com> | Thu Jan 08 10:46:53 2015 +0000 |
| tree | 82cf2be2b99d4a53b616eaf9a1b442a8166e433f | |
| parent | 1cad8899be13e5eaefbc8300a832a826870ea7ca [diff] | |
| parent | 36401a369949dc12a76d452f2d5213c8b09d903e [diff] |
resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aosp Change-Id: Ic280478a5979a47cac148c0eac9bdfd20ec0e6e7