commit | d4257e8f469eacc1ba8142b0b1bc4ca0327a7a0e | [log] [tgz] |
---|---|---|
author | Robert Greenwalt <rgreenwalt@google.com> | Wed Nov 13 17:50:35 2013 -0800 |
committer | Robert Greenwalt <rgreenwalt@google.com> | Wed Nov 13 17:50:35 2013 -0800 |
tree | e48570d73d77330f52520231337dff7f438ad134 | |
parent | c5f317e48e0406a0303eb1303cee4c5da2c6272d [diff] | |
parent | ec9e8933effe1dcb6887f7dca1cc0d78e6107e38 [diff] |
resolved conflicts for merge of ec9e8933 to klp-dev-plus-aosp Change-Id: I220a034cf3293a4a29d8683f20812adac112bddd