| commit | 6800165351b693fa7e4bcf0f205655f0cd16b361 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Sep 09 09:51:01 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Tue Sep 09 09:51:01 2014 -0700 |
| tree | 4d3911423ebd8e3642a487c7d1bf9da388109440 | |
| parent | 08dceea7d32475ac1cea85280deee5a87ac7ab86 [diff] | |
| parent | 1d99636fcccbf45a6cc39c478d534da7a5714eec [diff] |
resolved conflicts for merge of 1d99636f to lmp-dev-plus-aosp Change-Id: Ic5f808de7d9722056112c6a73c718892e00bc9df