| commit | 9e8b528926506b3fa9ca7df52fef5f56ec6149c7 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Sep 12 09:00:50 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Fri Sep 12 09:00:50 2014 -0700 |
| tree | 6b29911efb69adc379f115f71b9eb14009f0a8d9 | |
| parent | e03abcd61b127b10391b8257c35fbe66053e417a [diff] | |
| parent | 07c9557f603d405cbcb52434aca6f5ffdcc45072 [diff] |
resolved conflicts for merge of 07c9557f to lmp-dev-plus-aosp Change-Id: Ic212ab2ee90b1cc7db7203210b047c870bb5c476