| commit | c04d92cac93fdbbdc6d104f15f6496d197753e92 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Sep 19 15:57:26 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Fri Sep 19 15:57:26 2014 -0700 |
| tree | 8d8e1b83666562d4f28998c4b1e9b2ee5ac2ec44 | |
| parent | 901c36e51c052c6f0556b6272bbeaaa3aa716fd8 [diff] | |
| parent | 1a4527ce9449d913e7a60dc3784520006d8955b7 [diff] |
resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aosp Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c