| commit | 2ab8298dc37851aab4623ba3f98d71055d653a73 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Nov 21 14:19:06 2014 -0800 |
| committer | Andreas Gampe <agampe@google.com> | Fri Nov 21 14:19:06 2014 -0800 |
| tree | e31d76f1c16ec8e980983392b09287515bcec2f1 | |
| parent | 4c9041cf837cda13c749b148661d18c3fab0fbd6 [diff] | |
| parent | 99377df12ee696e01cd9071132f122801a9862ce [diff] |
resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp Change-Id: I3a98f55832ac447b1ed0dd129c7a93d088025943