| commit | c4025e90f4e73bd9bf9665000276663e35c0066b | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@google.com> | Mon Mar 17 16:13:08 2014 -0700 |
| committer | Doug Zongker <dougz@google.com> | Mon Mar 17 16:13:08 2014 -0700 |
| tree | f103aef739b9715fd1546b060e132a39a071a4af | |
| parent | 52d0b765ab58e7def9783623092f1891a4d7f427 [diff] | |
| parent | d90da13076303a5377de631623e16c34ee195830 [diff] |
resolved conflicts for merge of d90da130 to klp-dev-plus-aosp Change-Id: I19f9f460145fdcf5cdc58ee4fa25ff3c9ba398f0